Commit Graph
1583 Commits
Author SHA1 Message Date
王怡栋 026739dc18 Merge branch 'master' into 'sprint/224_dongli_bug63669'
# Conflicts:
#   module/my/css/task.css
2022-08-10 05:46:12 +00:00
dongli dacb68a745 * Fix bug #63669. 2022-08-10 03:35:16 +00:00
王怡栋 896f7d2fb1 Merge branch 'master_liuhong_63775' into 'master'
*Finish task #63775

See merge request easycorp/zentaopms!4873
2022-08-10 01:31:10 +00:00
王怡栋 bedec71945 Merge branch 'master_liuhong_63776' into 'master'
*Finish task #63776

See merge request easycorp/zentaopms!4872
2022-08-10 01:29:59 +00:00
xieqiyu 930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
xieqiyu 5d422ab3cb * Code for task#63775. 2022-08-09 10:07:45 +08:00
liuhong 4932e7885f *Finish task #63776 2022-08-08 15:59:43 +00:00
liuhong 2a5c5521fe *Finish task #35865. 2022-08-08 08:37:08 +00:00
liuhong bd88264c46 *Finish task #63775 2022-08-08 08:08:02 +00:00
liuhong 0578dd3cfb *Finish task #35865. 2022-08-08 06:40:19 +00:00
孙广明 d6f9849478 Merge branch 'zhouxin_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4813
2022-08-05 05:15:09 +00:00
王怡栋 351b8f37f5 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #25978, #25968, #26020.

See merge request easycorp/zentaopms!4814
2022-08-05 02:51:24 +00:00
liumengyi 175a703f11 * Fix bug #26020. 2022-08-05 10:49:10 +08:00
zhouxin a178209d6e * Fix bug. 2022-08-05 02:43:47 +00:00
王怡栋 da4c3895e1 Merge branch 'sprint/221_liumengyi_714' into 'master'
* Fix issue #714,#710, #706.

See merge request easycorp/zentaopms!4809
2022-08-05 02:40:22 +00:00
liumengyi 24a5917b4a * Fix issue #714. 2022-08-05 10:08:28 +08:00
zhouxin d4f4f06117 * Delete useless param. 2022-08-05 01:25:59 +00:00
zhouxin 6c1f9f0568 * Fix a bug. 2022-08-05 00:52:40 +00:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
daitingting 73810a1e26 * Fix bug #25943. 2022-08-04 08:14:08 +00:00
liumengyi 02a3c130c0 * Fix bug for task #63455. 2022-08-04 13:37:17 +08:00
liumengyi 8900769999 * Finish task #63455. 2022-08-04 09:47:16 +08:00
tianshujie 744da8aa6b * Fix bug #25448. 2022-07-28 15:52:45 +08:00
孙广明 61babc61a5 Merge branch 'sprint/scx_userapi' into 'master'
* Add User api param.

See merge request easycorp/zentaopms!4645
2022-07-27 05:10:22 +00:00
zenggang b176ea0967 * Adjust code 2022-07-26 07:33:14 +00:00
zenggang 6f3544c2d2 * Adjust code 2022-07-26 06:07:10 +00:00
zenggang 7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
宋辰轩 13a16c2020 * Add User api param. 2022-07-25 13:34:13 +08:00
wangyidong a8e07852e8 * fix bug for contribute bug. 2022-07-21 17:02:28 +08:00
liumengyi 59968a12e4 * Fix bug #24796. 2022-07-21 08:40:56 +08:00
liumengyi 369a66f0f0 * Fix bug #24796. 2022-07-20 17:06:34 +08:00
tianshujie 05eb3a5422 * Fix bug #25454. 2022-07-20 15:59:28 +08:00
tianshujie 468ce6bd6c * Fix bug #25444. 2022-07-19 15:14:39 +08:00
liumengyi 6c16eab8eb * Fix bug #25399. 2022-07-18 08:46:51 +08:00
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