Commit Graph
34439 Commits
Author SHA1 Message Date
孙广明 39d2a529b0 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4428
2022-07-08 02:46:11 +00:00
孙广明 df7787bbd1 Merge branch 'fixbug_createTask' into 'master'
Fixbug create task

See merge request easycorp/zentaopms!4427
2022-07-08 02:43:15 +00:00
tianshujie c4e930ce49 * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 10:41:23 +08:00
sunjun d2b201003b fixbug 2022-07-08 02:37:29 +00:00
孙广明 a6df7edcc1 Merge branch 'liyuchun_24840' into 'master'
* Fix bug #24840,24821.

See merge request easycorp/zentaopms!4425
2022-07-08 02:36:46 +00:00
tianshujie fe4b40e3cd * Fix bug #24127. 2022-07-08 10:34:05 +08:00
sunjun ed422485ed fixbug_report 2022-07-08 02:31:37 +00:00
tianshujie 2c6aeb6c19 * Fix bug #25014. 2022-07-08 10:15:18 +08:00
王怡栋 f61cacca8f Merge branch 'sprint212_leiyong_fix_bug' into 'master'
* Fix bug#24812.

See merge request easycorp/zentaopms!4408
2022-07-08 02:09:43 +00:00
王怡栋 272ba58696 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
Sprint/master zhouxudong 59681

See merge request easycorp/zentaopms!4426
2022-07-08 02:09:05 +00:00
zhouxudong 7988466f2f * Finish task #59681. 2022-07-08 02:07:45 +00:00
zhouxudong e146c91ecb * Finish task #59681. 2022-07-08 02:04:04 +00:00
孙广明 03f48af37f Merge branch 'sprint213_zg_59711' into 'master'
Hide cdf stat

See merge request easycorp/zentaopms!4424
2022-07-08 02:03:50 +00:00
sunjun f7400480d4 fixbug_createTask 2022-07-08 02:02:22 +00:00
leiyong b7074c0ec0 * Adjust CSS. 2022-07-08 01:58:21 +00:00
zhouxudong 85cecc60e5 * Finish task #59681. 2022-07-08 01:55:07 +00:00
tianshujie 102326db4f * Fix the problem of expired login prompt on the login page of the newly installed source package. 2022-07-08 09:48:08 +08:00
wangyidong 38cc476bb9 * fix bug #22749. 2022-07-08 09:47:42 +08:00
zhouxudong f8c7be2001 * Finish task #59681. 2022-07-08 01:47:03 +00:00
leiyong ea75f32195 * Adjsut CSS. 2022-07-08 01:46:15 +00:00
liyuchun 0951f5b56d * Fix bug #24840,24821. 2022-07-08 01:45:48 +00:00
zenggang b8c23acb69 * Adjust code 2022-07-08 01:42:17 +00:00
zenggang a01d530a0a * Hide cfd stat 2022-07-08 01:38:33 +00:00
孙广明 118e1f7854 Merge branch 'master_xieqiyu_kanban' into 'master'
Master xieqiyu kanban

See merge request easycorp/zentaopms!4420
2022-07-08 01:20:53 +00:00
孙广明 8ce405dec0 Merge branch 'sprint/213_mayue_bug#24848#24817' into 'master'
* Fix bug #24848#24817.

See merge request easycorp/zentaopms!4423
2022-07-08 01:20:09 +00:00
mayue 1df55e32a7 * Fix bug #24848#24817. 2022-07-08 09:18:53 +08:00
孙广明 6b33905ac8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4422
2022-07-08 01:10:03 +00:00
mayue f6d94ad4cb * Fix bug #24848#24817. 2022-07-08 09:06:39 +08:00
孙广明 fc08eb2060 Merge branch 'fixbug_24248' into 'master'
fixbug_24248

See merge request easycorp/zentaopms!4413
2022-07-08 01:05:19 +00:00
孙广明 f6ed1804b3 Merge branch 'sprint213_zg_24761' into 'master'
* Fix bug#24761,Adjuct cfd stat

See merge request easycorp/zentaopms!4414
2022-07-08 01:05:07 +00:00
tianshujie ce191b4f9e * Fix bug #24945. 2022-07-08 09:04:57 +08:00
孙广明 47011a1823 Merge branch 'liyuchun_59432' into 'master'
* Finish task #59432.

See merge request easycorp/zentaopms!4418
2022-07-08 01:04:54 +00:00
liumengyi 1681419642 * Fix bug for sort module. 2022-07-08 09:03:00 +08:00
tianshujie a2fbd1f47e * Fix bug #24961. 2022-07-08 08:56:55 +08:00
tianshujie b4a9f36ad9 * Fix bug #24972. 2022-07-08 08:50:07 +08:00
tianshujie d976a4caa8 * Fix bug #24697. 2022-07-08 08:28:36 +08:00
tianshujie be1ca95624 * Fix bug #24977. 2022-07-08 08:15:42 +08:00
刘刚 6d59cccaec Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.

See merge request easycorp/zentaopms!4419
2022-07-08 00:01:15 +00:00
xieqiyu 38dcc95cb4 * Code for task#59543. 2022-07-07 18:08:59 +08:00
xieqiyu 05a1b2be02 * Code for task#59543. 2022-07-07 17:52:30 +08:00
xieqiyu 29efcab628 * Code for task#59543. 2022-07-07 17:42:30 +08:00
liuruogu 63fe5c2750 * Fix bug #24865. 2022-07-07 09:23:56 +00:00
xieqiyu 07231be2d2 * Code for task#59543. 2022-07-07 17:23:09 +08:00
zenggang 24b36766fb * Adjuct cfd stat 2022-07-07 09:14:30 +00:00
liyuchun 18c28227bb * Finish task #59432. 2022-07-07 09:00:25 +00:00
liumengyi bb9ce6dd49 * Fix bug #24920. 2022-07-07 16:58:27 +08:00
王怡栋 9ef8354d1d Merge branch 'sprint/211_tianshujie_fixbug' into 'master'
* Fix bug #24946.

See merge request easycorp/zentaopms!4416
2022-07-07 08:51:25 +00:00
xieqiyu 2e733795f6 * Code for task#59543. Update bug to story. 2022-07-07 16:49:24 +08:00
王怡栋 0465854678 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix task #60100

See merge request easycorp/zentaopms!4415
2022-07-07 08:47:03 +00:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00