Commit Graph
1197 Commits
Author SHA1 Message Date
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
王怡栋 00312f6d4f Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358

See merge request easycorp/zentaopms!6431
2022-12-01 07:56:07 +00:00
chaideqing 3c3ce67354 * Refactor code. 2022-12-01 13:35:05 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
chaideqing 9fcb9099a7 * Fix feedback #1358. 2022-11-30 11:13:12 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
Yagami 9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liumengyi 0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
tianshujie 26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
mayue 2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
mayue 4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +08:00
李玉春 314f82091d Merge branch 'cyy_project' into 'master'
* Modify project icon.

See merge request easycorp/zentaopms!5960
2022-11-01 07:09:55 +00:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
hufangzhou 402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00:00
tanghucheng 376ce75e79 * Fix bug #29031,#29042,#29039. 2022-10-27 15:41:59 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie 354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
liyuchun 11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
zenggang 1e22332937 * Fix bug#28886 2022-10-25 01:02:04 +00:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
tianshujie cda753b5d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 08:54:08 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
tianshujie 8eda9a7f8c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-19 13:46:43 +08:00
tianshujie 8bbf77788a * Finish task #72348. 2022-10-18 14:34:29 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
wangyidong a51f42e7b8 * code for task #71609. 2022-10-10 09:08:28 +08:00
liyuchun 41bddc2893 Merge branch 'master' into zenops_46 2022-10-08 15:22:35 +08:00
liuyongkai 6422b24d96 * Resolve feedback #938. 2022-10-08 01:40:04 +00:00
曹延义 0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00
wangyidong fd1c722af1 * fix bug #28075. 2022-09-30 14:58:57 +08:00
wangyidong 9b403e8b64 * fix bug #28075. 2022-09-30 14:20:53 +08:00
孙广明 9c5e3353e6 Merge branch 'lyk_27556' into 'master'
* Fix bug #27556.

See merge request easycorp/zentaopms!5615
2022-09-29 06:43:24 +00:00
liuyongkai 11448f3cee * Fix bug #27556. 2022-09-29 06:39:47 +00:00
liuyongkai 2b815f88c1 * Fix bug #27556. 2022-09-29 06:09:50 +00:00
王怡栋 fe8d365582 Merge branch 'master_27982' into 'master'
Master 27982

See merge request easycorp/zentaopms!5602
2022-09-29 05:50:26 +00:00
liyuchun 6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
liuhong 46fb56826d *adjust code. 2022-09-28 14:00:58 +00:00
liuhong 491227bfaa *Adjust code for ditto format. 2022-09-28 13:53:45 +00:00
liuhong 419e054101 *Fix bug #27982 and Adjust code. 2022-09-28 07:38:07 +00:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
sunguangming ac8f6c9413 * Code for task effort bug. 2022-09-26 14:50:04 +08:00