Commit Graph
3481 Commits
Author SHA1 Message Date
qixinzhi 2901bf5be6 * Fix bug#34178 again. 2023-04-21 03:00:25 +00:00
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00
qixinzhi f6c6c55ad2 * Fix bug#33357. 2023-04-20 08:47:54 +00:00
qixinzhi dbc49828c0 * Fix bug#34300. 2023-04-20 07:44:26 +00:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
tianshujie 9cfaf694ec * Replace favorites button. 2023-04-20 11:25:46 +08:00
caoyanyi ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
qixinzhi e94d290a57 * Updata go-view dist. 2023-04-19 09:20:25 +00:00
tianshujie 44794fcd43 * Change button color. 2023-04-19 16:49:29 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
hufangzhou 438c55d059 * Merge code. 2023-04-19 16:18:56 +08:00
qixinzhi 4f6b66774b * Update go-view dist. 2023-04-19 07:33:29 +00:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
刘刚 03f2d486a6 Merge branch 'fix_bug_qxz' into 'master'
* Update echarts dist for radar chart bug.

See merge request easycorp/zentaopms!7467
2023-04-19 02:38:19 +00:00
qixinzhi d4f3aa0010 * Update echarts dist for radar chart bug. 2023-04-19 02:26:11 +00:00
qixinzhi c601c0e0b9 * Update go-view dist. 2023-04-19 02:18:29 +00:00
liumengyi 168ebe2b56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 09:08:44 +08:00
qixinzhi 8382355b0d * Updata go-view dist. 2023-04-18 07:52:35 +00:00
hufangzhou 103cde4dae * Merge code. 2023-04-18 15:51:03 +08:00
qixinzhi 03a537b900 * Updata go-view dist. 2023-04-18 06:33:33 +00:00
liumengyi 64a0db7ff0 Merge branch 'zentaopms_304' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:16 +08:00
liumengyi 17ee6ad3f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:01 +08:00
hufangzhou 00ab038bbf * Code for task #91375. 2023-04-18 11:05:43 +08:00
tianshujie 9df90e87a5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 10:44:37 +08:00
孙广明 e4be890795 Merge branch 'sprint/scx_modidypng' into 'master'
* Modify png and modify dimension name.

See merge request easycorp/zentaopms!7447
2023-04-18 02:09:38 +00:00
宋辰轩 55a2bcf29d * Modify png and modify dimension name. 2023-04-18 10:07:10 +08:00
qixinzhi e496b92a37 * Updata go-view dist. 2023-04-18 01:34:26 +00:00
tianshujie 59afadec4a * Code for task #91389,91390. 2023-04-18 09:03:43 +08:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
qixinzhi 51f44a622c * Updata go-view dist. 2023-04-17 07:28:27 +00:00
liumengyi 98e1cf39f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 13:21:13 +08:00
宋辰轩 1074ac1970 * Add biz png and modify screen first guide. 2023-04-17 11:25:47 +08:00
liumengyi 9f3228cd42 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-17 10:19:32 +08:00
宋辰轩 c50fab01ad * Add png to zentao. 2023-04-17 08:53:30 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
guofeilong 6787833a70 * ZUI: update icon files . 2023-04-14 14:25:02 +08:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
wangyuting2 d9e5061c30 * Add new goview. 2023-04-14 10:05:54 +08:00
zhaoke 9a7ade5b64 * Fix formatting issues. 2023-04-13 15:22:20 +08:00
qixinzhi e5ba059a33 * Update go-view dist. 2023-04-13 13:21:44 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke 70013fa98e Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-13 09:24:52 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
zhaoke 2b1ee45b2b Merge branch 'master' into zenops_66 2023-04-13 09:06:59 +08:00
liumengyi a36a0f3b27 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 16:49:36 +08:00
王怡栋 0e9151fe3c Merge branch 'dev/gfl_addIcon' into 'master'
ZUI: update Icons files .

See merge request easycorp/zentaopms!7387
2023-04-12 08:49:31 +00:00
刘刚 a42c624a73 Merge branch 'bar_scroll' into 'master'
* Update echarts dist.

See merge request easycorp/zentaopms!7386
2023-04-12 08:47:46 +00:00
liumengyi ca9c565982 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 16:39:44 +08:00
guofeilong 6dca9b89d4 ZUI: update Icons files . 2023-04-12 16:26:58 +08:00