Commit Graph
1208 Commits
Author SHA1 Message Date
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
孙广明 dc4333ef34 Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Optimize code about bug #29945.

See merge request easycorp/zentaopms!6307
2022-11-23 01:31:04 +00:00
mayue 410b839c15 * Optimize code about bug #29945. 2022-11-23 09:29:30 +08:00
孙广明 c3b5086237 Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Fix bug #29945.

See merge request easycorp/zentaopms!6305
2022-11-23 00:52:47 +00:00
mayue de42397894 * Fix bug #29945. 2022-11-23 08:41:11 +08:00
王怡栋 72106fa341 Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6300
2022-11-22 08:02:34 +00:00
liuhong d44f253a49 * Adjust code for feedback #1468. 2022-11-22 06:50:35 +00:00
王怡栋 68e6f5695f Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6261
2022-11-21 00:53:18 +00:00
liuhong efb20b02d8 * Adjust code for feedback #1468. 2022-11-21 00:01:24 +00:00
王怡栋 7961c8bc55 Merge branch 'master_feedback_1468' into 'master'
Master feedback 1468

See merge request easycorp/zentaopms!6251
2022-11-18 07:22:01 +00:00
liuhong ef32ff16ec * Adjust code for feedback #1468 2022-11-18 03:51:12 +00:00
mayue 8d97e96399 * Fix bug #29944. 2022-11-18 10:31:15 +08:00
liuhong 51f8bf37d6 * Resolved feedback #1468. 2022-11-18 02:06:16 +00:00
mayue 3ef1c553c4 * Fix bug #29755. 2022-11-17 16:04:56 +08:00
lanzongjun dc998d0082 * Fix task #76411 2022-11-17 14:40:50 +08:00
王怡栋 8d1cacab6f * fix bug. 2022-11-15 10:23:46 +08:00
tianshujie 2c75eaf8f6 * Modify the statistics of the plan list. 2022-11-11 09:04:31 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
hufangzhou 23dd1b4384 * Fix bug #29279. 2022-11-04 02:11:14 +00:00
caoyanyi abe3332930 * Fix bug #29224, 29094. 2022-11-03 14:56:55 +08:00
tianshujie 3ee6f1c348 * Fix bug #28199. 2022-11-02 15:36:58 +08:00
caoyanyi 7e3fa55506 * Adjust code. 2022-10-28 17:17:50 +08:00
caoyanyi b81056c6ea * Modify pri style. 2022-10-28 15:58:06 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi 87aff183a9 * Modify product plan desc style. 2022-10-27 08:28:35 +08:00
caoyanyi e28284d001 * Code for task #73764. 2022-10-26 15:04:34 +08:00
tianshujie bc8eb40f31 * Fix bug #28866. 2022-10-24 13:07:48 +08:00
tianshujie f4fdd2c320 * Finish task #72323. 2022-10-17 16:19:42 +08:00
曹延义 c6f8e04711 * Modify product plan js error. 2022-10-13 09:02:30 +08:00
曹延义 fce6c0a80f * Adjust code. 2022-10-10 16:20:30 +08:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
曹延义 f9f8a11b90 * Finish task #71903. 2022-10-10 13:57:56 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
wangzemei 8f02d62c13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-08 16:56:49 +08:00
sunguangming bdf73ff038 * Fix bug #28140. 2022-10-08 08:52:01 +08:00
wangzemei f854b15fe7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-09-30 15:25:35 +08:00
曹延义 10fad7a82c * Fix bug #28263. 2022-09-30 14:38:53 +08:00
曹延义 8901b0bb73 * Modify page style. 2022-09-30 14:05:40 +08:00
李玉春 05046906ea Merge branch 'sprint/244_tianshujie_28241' into 'master'
Sprint/244 tianshujie 28241

See merge request easycorp/zentaopms!5646
2022-09-30 05:21:40 +00:00
曹延义 29781b82c7 * Modify tips style. 2022-09-30 13:19:41 +08:00
曹延义 d3f1bb0b09 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_28201 2022-09-30 13:13:49 +08:00
曹延义 0bc21e827b * Modify product plan style. 2022-09-30 13:11:29 +08:00
tianshujie 27a8457894 * Fix bug #28241. 2022-09-30 13:10:02 +08:00
tianshujie 6d617467df * Fix bug #28241. 2022-09-30 10:51:25 +08:00
tianshujie 9d7debfff9 * Fix bug #28241. 2022-09-30 10:48:00 +08:00
wangzemei 8cab82e6ff * modify style 2022-09-30 09:51:23 +08:00
wangzemei 856061df32 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-09-30 09:41:40 +08:00
李玉春 2f26f526d7 Merge branch 'sprint/cyy_70499' into 'master'
Sprint/cyy 70499

See merge request easycorp/zentaopms!5629
2022-09-30 01:30:06 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00