Commit Graph
44445 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
liumengyi 8d8062122e * Code for unit test of bug. 2022-08-24 14:56:51 +08:00
mayue b64081a30e * Finish task #65893. 2022-08-24 14:56:00 +08:00
李玉春 9f3545476e Merge branch 'cyy_repo_view' into 'zenops_44'
Cyy repo view

See merge request easycorp/zentaopms!5088
2022-08-24 06:54:48 +00:00
tianshujie e30d4256f8 * Fix failed test cases for execution module. 2022-08-24 14:54:15 +08:00
caoyanyi 1e011d9279 * Adjust code. 2022-08-24 14:53:26 +08:00
caoyanyi efd5fbaa99 * Adjust codes. 2022-08-24 14:51:44 +08:00
xieqiyu 1254de5f3e * Fix bug#26769. 2022-08-24 14:50:53 +08:00
caoyanyi 78ae278128 * Adjust code. 2022-08-24 14:48:15 +08:00
caoyanyi db654fe25d * Adjust code. 2022-08-24 14:45:51 +08:00
caoyanyi 1c595933e8 * Modify repo commit info. 2022-08-24 14:43:05 +08:00
caoyanyi 006dc90afb * Code for task #65980. 2022-08-24 14:42:39 +08:00
孙广明 2a3b5e376c Merge branch 'liyuchun_65972' into 'zenops_44'
* Finish task #65982.

See merge request easycorp/zentaopms!5081
2022-08-24 06:32:02 +00:00
xieqiyu 6f18dfa4cc * Fix bug#26764. 2022-08-24 14:22:58 +08:00
xieqiyu a2c1dd7247 * Fix bug#26812. 2022-08-24 14:11:26 +08:00
xieqiyu 6b9885067d * Fix bug#26776. 2022-08-24 13:59:49 +08:00
宋辰轩 1f522398de *Fix program api bug. 2022-08-24 13:51:28 +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
zenggang c424e450cb * Adjust code 2022-08-24 03:28:59 +00:00
liuhong 11c2730361 *Fix bug #26725. 2022-08-24 03:28:26 +00:00
zenggang 73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
dongli 7e193ef699 * Fix bug #64973. 2022-08-24 03:10:12 +00: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
liyuchun 4c5c2aff37 * Finish task #65982. 2022-08-24 10:40:27 +08: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
guofeilong 83cb9a8b81 * update Picker_options: disableEmptySearch do while unremote 2022-08-24 02:15:28 +00: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
zenggang 7dd9fd6e25 * Finish task#65806 2022-08-24 01:10:51 +00:00
liuhong d9c174f921 *Fix bug #26725. 2022-08-24 01:09:11 +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