Commit Graph
47062 Commits
Author SHA1 Message Date
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
王怡栋 16f8d7450b Merge branch 'zentaopms_239_task#73845' into 'zentaopms_239'
* Finish task #73845 ~ #73848.

See merge request easycorp/zentaopms!5984
2022-11-02 06:24:45 +00:00
王怡栋 5010149390 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd

See merge request easycorp/zentaopms!5985
2022-11-02 06:22:55 +00:00
wangyidong f2cd7c12b4 * code for task #74779. 2022-11-02 14:21:24 +08:00
wangyuting2 a873368635 * Adjust lang. 2022-11-02 06:17:35 +00:00
wangyidong 557d32fbd3 * code for task #74775. 2022-11-02 14:05:22 +08:00
wangyuting2 dc4716f951 * Finish task #73845 ~ #73848. 2022-11-02 06:05:18 +00:00
wangyidong e29b72fe17 * code for unlink story and case from execution. 2022-11-02 13:32:02 +08:00
王怡栋 c534fb0065 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
Zentaopms 239 wyd

See merge request easycorp/zentaopms!5980
2022-11-02 03:57:36 +00:00
王怡栋 2c02e877ac Merge branch 'zentaopms_239_task#73838' into 'zentaopms_239'
* Finish task #73838 ~ #73844.

See merge request easycorp/zentaopms!5977
2022-11-02 02:25:51 +00:00
王怡栋 0699177140 Merge branch 'zentaopms_239_task_#73985' into 'zentaopms_239'
* Doing task #73985.

See merge request easycorp/zentaopms!5975
2022-11-02 02:23:51 +00:00
wangyidong fd56b11e41 * code for task #74779. 2022-11-02 10:18:26 +08:00
daitingting b163bd0f32 * Finish task #73985. 2022-11-02 02:09:34 +00:00
wangyidong 99889da499 * code for task #74781. 2022-11-02 09:27:14 +08:00
wangyidong 4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
wangyuting2 d54ca95ff6 * Finish task #73838 ~ #73844. 2022-11-02 01:15:40 +00:00
daitingting 8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
wangyidong 9aea6ec0fe * code for task #73995. 2022-11-01 16:38:26 +08:00
Yagami 6477ae1dff Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-11-01 16:10:10 +08:00
Yagami 3d211b68b0 * Finish task #74209. 2022-11-01 16:09:54 +08:00
wangyidong af3ae9e5df * code for task #73996. 2022-11-01 16:09:18 +08:00
Yagami a8cb634609 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-11-01 15:43:53 +08:00
Yagami c74b879c0b * Finish task #74206. 2022-11-01 15:43:31 +08:00
wangyidong 97dcdfb72b * fix bug #29130. 2022-11-01 15:40:06 +08:00
王怡栋 e818fd2302 Merge branch 'zentaopms_239_code_optimize' into 'zentaopms_239'
* Optimize codes.

See merge request easycorp/zentaopms!5967
2022-11-01 07:06:33 +00:00
wangyidong 4f824f9410 * code for task #73994. 2022-11-01 15:02:20 +08:00
Yagami 68665d5ed0 * Finish task #74207. 2022-11-01 14:57:52 +08:00
daitingting 219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
wangyidong 4a9e97b29c * code for task #73991. 2022-11-01 13:28:56 +08:00
wangyidong 9cd542f3c7 * code for task #73987. 2022-11-01 12:10:37 +08:00
wangyidong 40e20fa112 * code for task #74178. 2022-11-01 10:22:13 +08:00
wangyidong 3a8ef27bec * code for task #73993. 2022-11-01 08:45:15 +08:00
王怡栋 b04efbf36c Merge branch 'zentaopms_239_task_#73990' into 'zentaopms_239'
* Finish task #73989, #73990.

See merge request easycorp/zentaopms!5953
2022-10-31 07:19:32 +00:00
王怡栋 2d249ae8c5 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
* code for task #74183,74184,74185.

See merge request easycorp/zentaopms!5954
2022-10-31 07:19:01 +00:00
daitingting 16706253e7 * Finish task #73989, #73990. 2022-10-31 06:27:40 +00:00
wangyidong f9ec235880 * code for task #74183,74184,74185. 2022-10-31 14:20:48 +08:00
王怡栋 175a8102e0 Merge branch 'zentaopms_239_task#74156' into 'zentaopms_239'
* Finish task #74156.

See merge request easycorp/zentaopms!5948
2022-10-31 06:19:10 +00:00
wangyuting2 95a2e3da68 * Finish task #73828. 2022-10-31 06:08:56 +00:00
王怡栋 1c8a04527c Merge branch 'zentaopms_239_task_#74179' into 'zentaopms_239'
* Finish task #74179.

See merge request easycorp/zentaopms!5949
2022-10-31 06:04:54 +00:00
王怡栋 534dea4c8c Merge branch 'zentaopms_239_task_#74159' into 'zentaopms_239'
* Finish task #74159.

See merge request easycorp/zentaopms!5951
2022-10-31 06:04:24 +00:00
daitingting a1cf2ccdf8 * Finish task #74159. 2022-10-31 05:56:40 +00:00
王怡栋 7ff8c82cc3 Merge branch 'zentaopms_239_bug_#29073' into 'zentaopms_239'
* Fix bug #29073.

See merge request easycorp/zentaopms!5941
2022-10-31 05:56:08 +00:00
王怡栋 116913fdc8 Merge branch 'zentaopms_239_bug_#28966' into 'zentaopms_239'
* Fix bug #28966.

See merge request easycorp/zentaopms!5939
2022-10-31 05:42:31 +00:00
daitingting 47db9c31e3 * Finish task #74179. 2022-10-31 05:19:20 +00:00
wangyidong 7dee092c08 * code for task #74177. 2022-10-31 13:08:57 +08:00
wangyuting2 7c4c04938b * Finish task #74156. 2022-10-31 05:04:57 +00:00
daitingting 6a2200647e * Fix bug #29073. 2022-10-28 09:08:37 +00:00
daitingting dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
王 于听 6e50e57805 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Optimize code.

See merge request easycorp/zentaopms!5937
2022-10-28 08:06:08 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00