Commit Graph
44326 Commits
Author SHA1 Message Date
曾刚 72194dcc1a * Fix bug#26939 2022-08-29 02:55:19 +00:00
wangyidong d859327126 * fix bug #26951. 2022-08-29 09:17:51 +08:00
王怡栋 29ccc1512c Merge branch 'sprint/231_dongli_bug24387' into 'master'
* Fix bug #24387.

See merge request easycorp/zentaopms!5164
2022-08-29 00:49:15 +00:00
王怡栋 8a22b73e0e Merge branch 'master_xieqiyu_26779' into 'master'
Master xieqiyu 26779

See merge request easycorp/zentaopms!5159
2022-08-29 00:49:03 +00:00
王怡栋 5d8309b24a Merge branch 'sprint231/zg_unit' into 'master'
* Sprint231 unit

See merge request easycorp/zentaopms!5160
2022-08-29 00:48:03 +00:00
王怡栋 36d2dce485 Merge branch 'sprint/231_tianshujie_26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5158
2022-08-29 00:46:46 +00:00
王怡栋 c4c74ff325 Merge branch 'importExport' into 'master'
* Code for testcase import.

See merge request easycorp/zentaopms!5163
2022-08-29 00:45:30 +00:00
dongli 914ab9d955 * Delete useless files. 2022-08-28 13:28:59 +00:00
dongli 25fe8cd518 * Fix bug #24387. 2022-08-28 11:57:16 +00:00
tanghucheng 663434a666 * Code for story import. 2022-08-27 21:55:30 +08:00
zenggang 6c5c2a004f * Sprint231 unit 2022-08-26 09:38:31 +00:00
孙广明 72b130fb6c Merge branch 'sprint/231_liumengyi_26724' into 'master'
* Fix bug #26724.

See merge request easycorp/zentaopms!5157
2022-08-26 08:57:41 +00:00
xieqiyu e00f756381 * Fix bug#26779. 2022-08-26 16:47:57 +08:00
xieqiyu 34ec8c0a22 * Fix bug#26779. 2022-08-26 16:47:22 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
liumengyi fac28b389a * Fix bug #26724. 2022-08-26 16:12:07 +08:00
孙广明 5b759d1676 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5155
2022-08-26 07:46:16 +00:00
王怡栋 69674273fe Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5154
2022-08-26 07:45:42 +00:00
tianshujie eb6b6b061f * Fix bug #26950. 2022-08-26 15:34:18 +08:00
liumengyi 18efebc505 * Fix bug. 2022-08-26 15:33:46 +08:00
tianshujie e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
tianshujie ae8f299b55 * Fix bug #26950. 2022-08-26 15:25:17 +08:00
王怡栋 7345d4e036 Merge branch 'fix_bug#26945' into 'master'
* Fix bug #26945.

See merge request easycorp/zentaopms!5153
2022-08-26 07:23:28 +00:00
mayue 3952e3d312 * Fix bug #26945. 2022-08-26 15:22:00 +08:00
王怡栋 5077173b8b Merge branch 'master_xieqiyu_26898' into 'master'
* Fix bug#26898.

See merge request easycorp/zentaopms!5152
2022-08-26 07:21:30 +00:00
tianshujie 12e8aebfb2 * Fix bug #26946. 2022-08-26 15:18:58 +08:00
xieqiyu edfb5c538c * Fix bug#26898. 2022-08-26 15:16:50 +08:00
孙广明 3fde178457 Merge branch 'sprint/231_tianshujie_case' into 'master'
Sprint/231 tianshujie case

See merge request easycorp/zentaopms!5151
2022-08-26 07:12:18 +00:00
tianshujie db4a18e3bd * Methods to optimize execution modules. 2022-08-26 15:10:31 +08:00
tianshujie 1b61b51f97 * Add case for execution module. 2022-08-26 15:06:48 +08:00
孙广明 1800e4b046 Merge branch 'sprint/unittest_liumengyi_execution' into 'master'
* Add unit test of execution.

See merge request easycorp/zentaopms!5150
2022-08-26 07:03:11 +00:00
王怡栋 19b2168668 Merge branch 'master_xieqiyu_65696' into 'master'
Master xieqiyu 65696

See merge request easycorp/zentaopms!5148
2022-08-26 06:57:02 +00:00
王怡栋 f865fa9777 Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Update the changelog.

See merge request easycorp/zentaopms!5146
2022-08-26 06:55:52 +00:00
王怡栋 4adad82348 Merge branch 'master_liuhong_66212' into 'master'
*Fix bug #66212.

See merge request easycorp/zentaopms!5142
2022-08-26 06:55:36 +00:00
liumengyi cecf6460d7 * Add unit test of execution. 2022-08-26 14:51:49 +08:00
xieqiyu 0fdf8f06f8 * Fix bug#26942. 2022-08-26 14:51:11 +08:00
李玉春 754b84882e Merge branch 'cyy_api' into 'master'
* Modify product order and pager.

See merge request easycorp/zentaopms!5136
2022-08-26 06:13:20 +00:00
xieqiyu b11a645f00 * Fix bug#26941. 2022-08-26 14:09:28 +08:00
xieqiyu 40159e0ef9 * Fix bug#26940. 2022-08-26 14:05:22 +08:00
hufangzhou 5983b027ad * Update the changelog. 2022-08-26 14:03:38 +08:00
xieqiyu 79dc902ddd * Finish task#65696. 2022-08-26 13:58:56 +08:00
liuhong 4e634ef495 *Fix bug #66212. 2022-08-26 05:25:32 +00:00
王怡栋 705025b96c Merge branch 'sprint/231_zg_bugs' into 'master'
* Fix sprint231 bugs

See merge request easycorp/zentaopms!5145
2022-08-26 05:13:01 +00:00
王怡栋 c102deddbb Merge branch 'fixbug' into 'master'
* Fix bug #26906.

See merge request easycorp/zentaopms!5143
2022-08-26 05:12:23 +00:00
王怡栋 eaa366c64a Merge branch 'master_liuhong_66232' into 'master'
Fix bug #66232.

See merge request easycorp/zentaopms!5144
2022-08-26 05:11:51 +00:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
liuhong 04611bb5cc Fix bug #66232. 2022-08-26 03:31:58 +00:00
tanghucheng 24dab5df38 * Fix bug #26906. 2022-08-26 11:30:14 +08:00
liuhong 0e058dc8e3 *Fix bug #66212. 2022-08-26 02:38:19 +00:00
孙广明 7bd4ace927 Merge branch 'sprint/scx_programapi' into 'master'
*Fix program api bug.

See merge request easycorp/zentaopms!5087
2022-08-26 02:19:50 +00:00