Commit Graph
45933 Commits
Author SHA1 Message Date
wangzemei 6699322ba9 * adjust the format 2022-10-26 10:30:16 +08:00
tianshujie a5e393821d * Optimize the style of maintaining multi-tasking teams. 2022-10-26 10:30:16 +08:00
tianshujie afe1c0b6e7 * Optimize the style of maintaining multi-tasking teams. 2022-10-26 10:30:16 +08:00
tianshujie eb4d2fceb1 * Finish task #72347. 2022-10-26 10:30:16 +08:00
曹延义 d6b85a5992 * Modify multi task activate. 2022-10-26 10:30:16 +08:00
曹延义 5cf5ae06b2 * Finish task #72375. 2022-10-26 10:30:16 +08:00
caoyanyi 9c0cd9a803 * Code for task #72375. 2022-10-26 10:30:11 +08:00
caoyanyi 3ede09530c * Finish task #72347. 2022-10-26 10:29:10 +08:00
tianshujie be51fcec49 * Finish task #72348. 2022-10-26 10:28:17 +08:00
tianshujie 6daef64341 * Finish task #72348. 2022-10-26 10:28:17 +08:00
tianshujie 308b84bb1d * Finish task #72348. 2022-10-26 10:28:17 +08:00
wangzemei 32f8f0e4f0 * modify radas radius 2022-10-26 10:28:17 +08:00
wangzemei 35ca6f3dd7 * fix max 2022-10-26 10:28:17 +08:00
wangzemei fa1df1613e * replace max 2022-10-26 10:28:17 +08:00
wangzemei 096e0db92d * modify style 2022-10-26 10:28:17 +08:00
wangzemei 798e5cdd02 * replace echarts.timeline.js 2022-10-26 10:28:17 +08:00
wangzemei 1cc8f59d79 * modify style 2022-10-26 10:28:17 +08:00
wangzemei 15691f7f34 * finish task 2022-10-26 10:28:16 +08:00
wangzemei 9cabfb1e7f show imgs 2022-10-26 10:28:16 +08:00
wangzemei 4efa9f7dec * show echarts autoPlay 2022-10-26 10:28:16 +08:00
wangzemei 3f26c00ac4 * show echarts autoPlay 2022-10-26 10:28:16 +08:00
wangzemei 5167a59862 * stash modify 2022-10-26 10:28:16 +08:00
tianshujie 1f30e8c55d * Finish task #72350. 2022-10-26 10:28:16 +08:00
wangzemei 907d79e1a9 * rename classname 2022-10-26 10:28:16 +08:00
wangzemei fef8bf7b19 * remove unused file 2022-10-26 10:28:16 +08:00
wangzemei 84adad2cc7 * task 72350 2022-10-26 10:28:16 +08:00
caoyanyi db0682128e * Code for task #73414. 2022-10-25 11:06:28 +08:00
caoyanyi c3337a531e * Modify pri style. 2022-10-24 17:22:28 +08:00
caoyanyi d7354a55ee * Add nc browse style. 2022-10-24 17:01:32 +08:00
caoyanyi 3867eb0f55 * Code for execution #3238. 2022-10-24 16:56:27 +08:00
胡方舟 d4541ebf3d Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* fix chat avatar failing to upload.

See merge request easycorp/zentaopms!5862
2022-10-24 02:33:37 +00:00
Wenrui LI a514f87ad1 * fix chat avatar failing to upload. 2022-10-24 10:24:03 +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
王怡栋 7c1d105f9e Merge branch 'sprint/zentaobiz12_ticket' into 'master'
fix bug guide

See merge request easycorp/zentaopms!5859
2022-10-21 08:15:04 +00:00
lanzongjun da3f54870d fix bug guide 2022-10-21 16:13:38 +08:00
王怡栋 b39c666128 Merge branch 'bug_28795' into 'master'
Bug 28795

See merge request easycorp/zentaopms!5858
2022-10-21 07:59:10 +00:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
王怡栋 de5212fd90 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#28145.

See merge request easycorp/zentaopms!5855
2022-10-21 07:58:16 +00:00
xieqiyu 6731c7d6cb * Fix bug#26119. 2022-10-21 15:40:36 +00:00
xieqiyu 1a4bfe923e * Fix bug#26953. 2022-10-21 14:58:17 +00:00
xieqiyu 530f513af0 * Fix bug#26957. 2022-10-21 14:55:46 +00:00
xieqiyu cdb45a8925 * Fix bug#28145. 2022-10-21 13:16:52 +00:00
王怡栋 d84799d514 Merge branch 'master_bug_28775' into 'master'
* Fix bug #28775.

See merge request easycorp/zentaopms!5854
2022-10-21 07:57:39 +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
李玉春 ea7ed2c31b Merge branch 'sprint/247_wzm_blue' into 'master'
* fix table line aboout blue

See merge request easycorp/zentaopms!5857
2022-10-21 06:04:17 +00:00
wangzemei 04755d5920 * fix table line aboout blue 2022-10-21 14:01:30 +08:00
liuhong bb47c6e1da * Fix bug #28775. 2022-10-21 05:22:05 +00:00
liuhong 482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
孙广明 768aa9ba1b Merge branch 'biz13_mayue_bug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!5849
2022-10-21 03:44:34 +00:00
mayue bd13e39ade * Add product column. 2022-10-21 11:42:43 +08:00