Commit Graph
45915 Commits
Author SHA1 Message Date
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
caoyanyi 4b481f534b * Fix bug #28786. 2022-10-21 11:25:54 +08:00
王怡栋 30297395a9 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug .

See merge request easycorp/zentaopms!5850
2022-10-21 03:23:28 +00:00
tanghucheng 9f93959a3f * Fix bug . 2022-10-21 11:12:55 +08:00
王怡栋 104d16426e Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28711.

See merge request easycorp/zentaopms!5842
2022-10-21 03:09:26 +00:00
mayue 9c958e3b9a * Optimize code. 2022-10-21 11:06:52 +08:00
孙广明 bc6716dcdb Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
fix icon-ticket

See merge request easycorp/zentaopms!5848
2022-10-21 02:58:53 +00:00
lanzongjun 6d540cc1cb fix icon-ticket 2022-10-21 10:45:52 +08:00
孙广明 179e7f7ee2 Merge branch 'sprint/ZUI_guofeilong_add_icon_ticket' into 'master'
* add Icon ticket

See merge request easycorp/zentaopms!5847
2022-10-21 02:41:43 +00:00
guofeilong 1acc727f00 * add Icon ticket 2022-10-21 02:26:53 +00:00
李玉春 f94b7a668b Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fix bug #28764.

See merge request easycorp/zentaopms!5841
2022-10-20 23:57:56 +00:00
tianshujie c9331a121c * Fix bug #28764. 2022-10-20 17:22:36 +08:00
tanghucheng 4bb1f27573 * Fix bug #28711. 2022-10-20 17:06:00 +08:00
王怡栋 81706bf839 Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug

See merge request easycorp/zentaopms!5836
2022-10-20 07:50:14 +00:00
lanzongjun 5583916635 * fix bug 2022-10-20 15:46:59 +08:00
王怡栋 f9b58e0701 Merge branch 'sprint/hufangzhou_sql' into 'master'
* Fix bug #28718.

See merge request easycorp/zentaopms!5830
2022-10-20 07:38:29 +00:00
王怡栋 647dd3107c Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug

See merge request easycorp/zentaopms!5835
2022-10-20 07:35:52 +00:00
孙广明 5241c9ce44 Merge branch 'biz13_mayue_bug#28700' into 'master'
* Fix bug #28700.

See merge request easycorp/zentaopms!5834
2022-10-20 07:34:42 +00:00
mayue 5e7ab9df55 * Fix bug #28700. 2022-10-20 15:02:59 +08:00