Commit Graph
1548 Commits
Author SHA1 Message Date
sunjun d5c9657af2 fixbug 2022-07-13 06:16:14 +00:00
leiyong 3a55d594c3 * Finish task#60375. 2022-07-11 07:18:52 +00:00
刘刚 e7767459f2 Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10

See merge request easycorp/zentaopms!4385
2022-07-06 09:08:05 +00:00
liuruogu 5aabaa4c1e * Fix bug #24782. 2022-07-06 07:03:56 +00:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong c23b4fe7b6 * Finish task #59536 #59537. 2022-07-05 07:34:49 +00:00
王怡栋 71ab49c34e Merge branch 'sprint/master_zhouxudong_59529' into 'master'
* Finish task #59534 #59530 #59529.

See merge request easycorp/zentaopms!4325
2022-07-05 02:09:08 +00:00
mayue a9773c6be0 * Finish task #59700. 2022-07-04 17:22:22 +08:00
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
xieqiyu c17767fcd1 * Fix bug of runCase in my. 2022-07-01 08:24:25 +08:00
xieqiyu ff682ac683 * Fix bug#23977. 2022-06-30 09:04:15 +08:00
王怡栋 e05ac602cc Merge branch 'master_xieqiyu_58567' into 'master'
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
2022-06-28 09:31:57 +00:00
xieqiyu 92926fce1d * Finish task#58567. 2022-06-28 16:48:45 +08:00
leiyong a5b4a79ea8 * Adjust code. 2022-06-28 05:26:37 +00:00
王怡栋 2f837a3970 Merge branch 'sprint209_leiyong_task_58598' into 'master'
Sprint209 leiyong task 58598

See merge request easycorp/zentaopms!4167
2022-06-28 01:42:06 +00:00
leiyong 808d67b879 * Adjust code. 2022-06-27 10:32:20 +00:00
leiyong f8087acd1d * Finish task#58598. 2022-06-27 08:49:52 +00:00
hufangzhou f9f3b0c716 * Code for task #58568. 2022-06-27 14:52:11 +08:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
王怡栋 a3bb60c87d Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'
Sprint/master zhouxudong 57871

See merge request easycorp/zentaopms!4024
2022-06-21 06:03:28 +00:00
leiyong 725f37fcd0 * Finish task#57868. 2022-06-20 09:55:19 +00:00
zhouxudong e2d00ec066 * Finish task #57880 #57881 #57866. 2022-06-20 08:11:52 +00:00
zhouxudong 32c34c35e9 * Finish task #57880 #57881 #57866. 2022-06-20 07:43:08 +00:00
zhouxudong 19d289455a * Finish task #57880 #57881 #57866. 2022-06-20 06:34:29 +00:00
tanghucheng 9d92db9900 * Fix bug #23891. 2022-06-17 15:25:12 +08:00
zhouxudong d31dbf6002 * Fix contacts style for different theme. 2022-06-16 00:33:27 +00:00
王怡栋 99f6d0f16f Merge branch 'sprint/master_zhouxudong_56918' into 'master'
* Finish task #56918.

See merge request easycorp/zentaopms!3929
2022-06-15 05:33:58 +00:00
zhouxudong a5f8fdaef3 * Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918. 2022-06-15 01:42:32 +00:00
zhouxudong 6dc1ecfa95 * Finish task #56918. 2022-06-14 08:08:52 +00:00
王怡栋 dce5aa0a23 Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915

See merge request easycorp/zentaopms!3909
2022-06-14 07:18:50 +00:00
tanghucheng 1f1b79948a * Finish story #33374. 2022-06-14 15:03:36 +08:00
zhouxudong 1ad55fdd08 * Finish task #56915. 2022-06-14 06:39:25 +00:00
zhouxudong 50571ec217 * Finish task #56915. 2022-06-14 03:13:14 +00:00
zhouxudong fa4d314709 * Finish task #56915. 2022-06-14 01:09:07 +00:00
孙广明 a42ef81a50 Merge branch 'fixbug_sunjun_23572' into 'master'
fixbug_sunjun_23572

See merge request easycorp/zentaopms!3874
2022-06-13 00:54:52 +00:00
sunjun c8bf2f2e67 fixbug_sunjun_23572 2022-06-13 00:17:47 +00:00
zhouxin 619e31e6f9 * Fix issue. 2022-06-10 08:10:41 +00:00
sunjun 41c6a655a2 fixbug_requirement 2022-06-10 05:24:15 +00:00
sunjun e21aff2d5d sprint_sunjun_201 2022-06-10 04:29:30 +00:00
李玉春 15812a5cb1 Merge branch '201_zhouxin_56467' into 'master'
201 zhouxin 56467

See merge request easycorp/zentaopms!3853
2022-06-10 02:53:00 +00:00
zhouxin d1e3ba6c5e * Adjust code. 2022-06-10 02:46:45 +00:00
mayue e11b76d819 * Ajust mutual test issue. 2022-06-10 10:23:27 +08:00
zhouxin c7aa2f7fff * Adjust code. 2022-06-10 01:43:10 +00:00
tianshujie baff0cf4fe * Optimize code. 2022-06-10 09:23:12 +08:00
zhouxin ee8af517fa * Finish task #56467. 2022-06-10 01:22:12 +00:00
孙广明 4e40722b6d Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!3845
2022-06-10 01:08:31 +00:00
王怡栋 fad3f54c7b Merge branch 'sprint/201_tianshujie_56460' into 'master'
* Finish task #56460.

See merge request easycorp/zentaopms!3844
2022-06-10 01:07:17 +00:00