Commit Graph
44115 Commits
Author SHA1 Message Date
胡方舟 2f2fc272e6 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5091
2022-08-24 07:11:24 +00:00
tianshujie 067abe91c3 * * Fix failed test cases for execution module. 2022-08-24 15:06:09 +08:00
tianshujie 99e3ef7a18 * Fix failed test cases for execution module. 2022-08-24 14:59:54 +08:00
tianshujie e30d4256f8 * Fix failed test cases for execution module. 2022-08-24 14:54:15 +08:00
王怡栋 00b8ffc6f7 Merge branch 'sprint/unittest_liumengyi_bug' into 'master'
* Unit test of bug.

See merge request easycorp/zentaopms!4993
2022-08-24 05:47:55 +00:00
王怡栋 f097c7b756 Merge branch 'sprint/hufangzhou_executionunittest' into 'master'
* Modify the create and edit unit test case of execution module.

See merge request easycorp/zentaopms!5085
2022-08-24 05:41:33 +00:00
王怡栋 c2ac2b1f5a Merge branch 'sprint/231_liumengyi_26768' into 'master'
* Fix bug #26768.

See merge request easycorp/zentaopms!5082
2022-08-24 05:34:42 +00:00
hufangzhou 243f2f468a * Modify the create and edit unit test case of execution module. 2022-08-24 11:30:59 +08:00
liumengyi 1c3ca8a460 * Optimize code for bug #26768. 2022-08-24 11:02:25 +08:00
王怡栋 cc010cb7f6 Merge branch 'master_liuhong_66233' into 'master'
*Fix bug #66233.

See merge request easycorp/zentaopms!5074
2022-08-24 02:56:12 +00:00
liumengyi e1a022ba7f * Fix bug #26768. 2022-08-24 10:54:29 +08:00
王怡栋 e69817011e Merge branch 'master_liuhong_66212' into 'master'
*Fix bug #66212.

See merge request easycorp/zentaopms!5072
2022-08-24 02:54:07 +00:00
王怡栋 dbe42f9aa1 Merge branch 'master_xieqiyu_fixStoryBug' into 'master'
Master xieqiyu fix story bug

See merge request easycorp/zentaopms!5079
2022-08-24 02:49:17 +00:00
李玉春 00ada6310a Merge branch 'sprint/231_tianshujie_css' into 'master'
* Modify name beyond hidden style.

See merge request easycorp/zentaopms!5075
2022-08-24 02:26:51 +00:00
tianshujie 0df81d9a3b * Fix bug #26817. 2022-08-24 10:19:19 +08:00
xieqiyu 840e0dd810 * Delete unused code. 2022-08-24 10:10:04 +08:00
xieqiyu 1db00037b4 * * Modify update sql of change story status. 2022-08-24 10:05:49 +08:00
孙广明 ee058ad83c Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Modify text-overflow style.

See merge request easycorp/zentaopms!5078
2022-08-24 01:25:59 +00:00
王怡栋 03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
liuhong c78a38c55e *Fix bug #66212. 2022-08-24 01:13:14 +00:00
dongli 0e393e120b * Remove useless spaces. 2022-08-24 01:10:59 +00:00
liumengyi b323432098 * Modify text-overflow style. 2022-08-24 09:00:09 +08:00
liuhong 4e574b0a67 *Fix bug #66233. 2022-08-24 00:57:41 +00:00
王怡栋 5bbf28e974 Merge branch 'master_xieqiyu_60722' into 'master'
* Finish task#60722.

See merge request easycorp/zentaopms!5070
2022-08-24 00:56:02 +00:00
王怡栋 882b3820d9 Merge branch 'max43_tanghucheng' into 'master'
* Fix bug #26265.

See merge request easycorp/zentaopms!5073
2022-08-24 00:55:30 +00:00
tianshujie a63dd2500f * Modify name beyond hidden style. 2022-08-24 08:55:16 +08:00
dongli 17a439cac3 * Finish task #64972,64973,64969. 2022-08-24 00:55:13 +00:00
王怡栋 0036bac572 Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.

See merge request easycorp/zentaopms!5047
2022-08-24 00:46:46 +00:00
liuhong 8afa885e52 *Fix bug #66233. 2022-08-24 00:44:54 +00:00
liuhong 91fddc338e *Fix bug #66212. 2022-08-24 00:08:16 +00:00
xieqiyu e81b8552fe * Add lang of requirement. 2022-08-23 22:01:22 +08:00
xieqiyu a36eb814db * Add story type for submit review. 2022-08-23 21:52:11 +08:00
tanghucheng a1b16e0132 * Fix bug #26265. 2022-08-23 21:03:50 +08:00
dongli f3b8e63376 * Finsh task #64972,64973,64969. 2022-08-23 10:46:03 +00:00
liuhong 329238d8cd *Fix bug #26000. 2022-08-23 09:23:09 +00:00
孙广明 c7090f6892 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Correct the translation.

See merge request easycorp/zentaopms!5071
2022-08-23 09:18:57 +00:00
liumengyi 6f187e3a23 * Correct the translation. 2022-08-23 17:16:49 +08:00
xieqiyu 6e531700ee * Finish task#60722. 2022-08-23 16:56:58 +08:00
李玉春 3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi 277ee237d9 * Optimize code for task #65808, #65807. 2022-08-23 16:25:38 +08:00
王怡栋 f814ff44fa Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #65904

See merge request easycorp/zentaopms!5069
2022-08-23 08:25:06 +00:00
liumengyi c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00
tianshujie 3a99afd287 * Finish task #65808,65807. 2022-08-23 16:12:52 +08:00
lanzongjun a658491395 * fix bug #65904 2022-08-23 15:57:06 +08:00
liumengyi 06c64d7e6f * Optimize code for task #65808, #65807. 2022-08-23 15:48:47 +08:00
tianshujie 44d270da18 * Finish task #65808. 2022-08-23 15:48:20 +08:00
tianshujie fda29bc600 Merge branch 'sprint/231_tianshujie_65808' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/231_tianshujie_65808 2022-08-23 15:40:43 +08:00
tianshujie 15eface39c * Finish task #65808. 2022-08-23 15:40:29 +08:00
孙广明 cae4f4b2c7 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of update story datetable.

See merge request easycorp/zentaopms!5064
2022-08-23 07:28:19 +00:00
孙广明 ff0560288d Merge branch 'sprint/max43_mayue_bug#26655' into 'master'
* Fix bug #26655.

See merge request easycorp/zentaopms!5066
2022-08-23 07:28:05 +00:00