Commit Graph
3216 Commits
Author SHA1 Message Date
李玉春 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
王怡栋 707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
王怡栋 afd87a2364 Merge branch 'sprint/hufangzhou_feedback_1304' into 'master'
* Handle feedback #1304.

See merge request easycorp/zentaopms!5957
2022-11-01 05:32:32 +00:00
liuhong fe056715f5 * Adjust code for bug #26228. 2022-10-31 10:03:23 +00:00
Lufei 031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
hufangzhou 402d4a6333 * Handle feedback #1304. 2022-10-31 07:31:00 +00:00
liuhong 0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
caoyanyi 7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
caoyanyi 284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +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
zenggang 1e22332937 * Fix bug#28886 2022-10-25 01:02:04 +00:00
wangyidong ef7072c10a * fix bug #28870. 2022-10-24 14:11:29 +08:00
李玉春 90f948780e Merge branch 'cyy_bug' into 'master'
* Fix bug #28786.

See merge request easycorp/zentaopms!5851
2022-10-21 08:30:02 +00:00
王怡栋 d1960a0f55 Merge branch 'master_bug_24436' into 'master'
* Fix bug #24436.

See merge request easycorp/zentaopms!5853
2022-10-21 07:57:15 +00:00
caoyanyi 380777ecf8 * Fix bug #28788. 2022-10-21 13:19:54 +08:00
liuhong 482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
caoyanyi 4b481f534b * Fix bug #28786. 2022-10-21 11:25:54 +08:00
tianshujie ae0c045c02 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 16:06:26 +08:00
tianshujie faabb32285 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 15:53:21 +08:00
tianshujie 4bce0e6e99 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 14:17:54 +08:00
李玉春 05e2c8242b Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5824
2022-10-20 06:15:37 +00:00
李玉春 23b1e0db4c Merge branch 'sprint/cyy_72375' into 'sprint/247'
* Modify multi task activate.

See merge request easycorp/zentaopms!5826
2022-10-20 06:04:53 +00:00
tianshujie 209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
曹延义 03e4c78c5f * Modify multi task activate. 2022-10-20 11:25:42 +08:00
tianshujie ca79d11271 * Finish task #72347. 2022-10-20 11:06:14 +08:00
tianshujie d55aedf3e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 11:04:27 +08:00
李玉春 c266ba1006 Merge branch 'sprint/cyy_72375' into 'sprint/247'
Sprint/cyy 72375

See merge request easycorp/zentaopms!5818
2022-10-20 01:57:11 +00:00
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义 fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +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
曹延义 1b80975ac1 * Code for task #72375. 2022-10-19 17:21:35 +08:00
孙广明 020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
曹延义 3ce6ca1f4f Merge branch 'master' into sprint/247 2022-10-19 15:21:14 +08:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
李玉春 a18bb50ef9 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fixed maintenance task team style issues.

See merge request easycorp/zentaopms!5795
2022-10-19 05:13:36 +00:00
tianshujie 056358363d * Fixed maintenance task team style issues. 2022-10-19 11:56:03 +08:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
tanghucheng 6c063505d6 Merge branch 'master' into tanghucheng_feedback_module 2022-10-18 15:33:45 +08:00
tianshujie 8bbf77788a * Finish task #72348. 2022-10-18 14:34:29 +08:00
wangzemei 9eb84fcc4e * modify format 2022-10-18 13:06:15 +08:00
wangzemei 0b2907217f * replace input component 2022-10-18 09:43:23 +08:00
tianshujie 8c85776666 * Finish task #72348. 2022-10-18 09:28:51 +08:00
tianshujie 86929e218d * Finish task #72348. 2022-10-18 09:21:07 +08:00
wangzemei 7075426106 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349 2022-10-18 08:56:26 +08:00
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00:00
wangzemei 5064fc3669 * update createTaskTeam style 2022-10-17 16:45:59 +08:00