 孙广明
|
f6c1d5ffca
|
Merge branch 'sprint/272_tsj_theme' into sprint/272
|
2022-12-21 16:00:12 +08:00 |
|
|
孙广明
|
dac9acb115
|
Merge branch 'sprint/272' into 'sprint/272_tsj_theme'
# Conflicts:
# module/block/view/visionswitch.html.php
|
2022-12-21 07:59:41 +00:00 |
|
|
田淑杰
|
a2fa75e05b
|
* Finish task #79626.
|
2022-12-21 15:54:42 +08:00 |
|
|
王怡栋
|
9edf73ff68
|
Merge branch 'sprint/272_wzm_vision' into 'sprint/272'
* Optimized page display
See merge request easycorp/zentaopms!6609
|
2022-12-21 07:26:35 +00:00 |
|
|
wangzemei
|
d837b16812
|
* Optimized page display
|
2022-12-21 15:20:30 +08:00 |
|
|
wangzemei
|
68434d5018
|
* Optimized page display
|
2022-12-21 15:19:28 +08:00 |
|
|
田淑杰
|
a3e5882fb3
|
* Finish task #79626.
|
2022-12-21 14:39:56 +08:00 |
|
|
王怡栋
|
ad2a39cac2
|
Merge branch 'sprint/272_wzm_31070' into 'sprint/272'
* fix 31070
See merge request easycorp/zentaopms!6608
|
2022-12-21 06:33:12 +00:00 |
|
|
田淑杰
|
bd5d882e35
|
* Finish task #79626.
|
2022-12-21 14:11:10 +08:00 |
|
|
wangzemei
|
0560303306
|
* fix 31070
|
2022-12-21 14:08:50 +08:00 |
|
|
caoyanyi
|
3a6ed5c082
|
* Optimize page style.
|
2022-12-21 11:52:31 +08:00 |
|
|
caoyanyi
|
449d18b712
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 11:44:46 +08:00 |
|
|
caoyanyi
|
a95a9e8d00
|
* Modify page style and language.
|
2022-12-21 11:44:28 +08:00 |
|
|
孙广明
|
5d99b865ad
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
* Finish task #79625.
See merge request easycorp/zentaopms!6607
|
2022-12-21 03:28:11 +00:00 |
|
|
田淑杰
|
dbd5714465
|
* Finish task #79625.
|
2022-12-21 11:26:52 +08:00 |
|
|
caoyanyi
|
42f6c6f5f5
|
* Modify page style.
|
2022-12-21 11:26:34 +08:00 |
|
|
caoyanyi
|
2efe9e2960
|
* Modify page style.
|
2022-12-21 11:00:22 +08:00 |
|
|
caoyanyi
|
3d47677d3a
|
* Modify page style.
|
2022-12-21 10:52:09 +08:00 |
|
|
孙广明
|
c2ea44f0c7
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
* Fixed positioning issues of guide block.
See merge request easycorp/zentaopms!6606
|
2022-12-21 02:45:41 +00:00 |
|
|
田淑杰
|
7aff4d599e
|
* Fixed positioning issues of guide block.
|
2022-12-21 10:17:32 +08:00 |
|
|
caoyanyi
|
cb51799c85
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 09:11:19 +08:00 |
|
|
caoyanyi
|
00a774e19e
|
* Modify page reload.
|
2022-12-21 09:11:06 +08:00 |
|
|
田淑杰
|
4eeaf48a5a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-21 08:56:35 +08:00 |
|
|
caoyanyi
|
1192ea3680
|
* Modify page position.
|
2022-12-20 21:01:56 +08:00 |
|
|
孙广明
|
dd6992d4bc
|
Merge branch 'zhouxin_feedback_172' into 'master'
* Resolve feedback #172.
See merge request easycorp/zentaopms!6604
|
2022-12-20 07:43:46 +00:00 |
|
|
zhouxin
|
d741dfd154
|
* Resolve feedback #172.
|
2022-12-20 07:29:13 +00:00 |
|
|
孙广明
|
b4112578bf
|
Merge branch 'sprint/272_tsj' into 'sprint/272'
Sprint/272 tsj
See merge request easycorp/zentaopms!6603
|
2022-12-20 07:09:56 +00:00 |
|
|
田淑杰
|
00a8e6317a
|
* Refactor.
|
2022-12-20 14:53:46 +08:00 |
|
|
田淑杰
|
cbd8fa5706
|
* Refactor.
|
2022-12-20 14:06:30 +08:00 |
|
|
wangyidong
|
ac9e876101
|
* code task #80452.
|
2022-12-20 13:53:37 +08:00 |
|
|
田淑杰
|
eaa184f3bc
|
* Finish task #79626.
|
2022-12-20 13:51:33 +08:00 |
|
|
田淑杰
|
ef53759baf
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tsj
|
2022-12-20 13:41:56 +08:00 |
|
|
wangyidong
|
58efe7b011
|
* code task #80458,80463.
|
2022-12-20 11:31:15 +08:00 |
|
|
田淑杰
|
86a21acfb0
|
* Finish task #79627.
|
2022-12-20 11:29:13 +08:00 |
|
|
王怡栋
|
93c174c0a3
|
Merge branch 'sprint/272_wzm_fixhref' into 'sprint/272'
* fix href
See merge request easycorp/zentaopms!6602
|
2022-12-20 03:12:49 +00:00 |
|
|
wangzemei
|
ba69b3285d
|
* fix href
|
2022-12-20 11:08:57 +08:00 |
|
|
caoyanyi
|
7e3b50d9f0
|
* Add priv check.
|
2022-12-20 11:02:40 +08:00 |
|
|
王怡栋
|
72cc0cc0aa
|
Merge branch 'sprint/272_wzm_79625' into 'sprint/272'
* finish task 79625
See merge request easycorp/zentaopms!6600
|
2022-12-20 02:52:50 +00:00 |
|
|
wangzemei
|
3495f621bf
|
* Delete space
|
2022-12-20 10:49:06 +08:00 |
|
|
王怡栋
|
ffe0b359e9
|
Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752
See merge request easycorp/zentaopms!6599
|
2022-12-20 02:43:23 +00:00 |
|
|
王怡栋
|
2d7d58ed29
|
Merge branch 'sprint/cyy_79631' into 'sprint/272'
* Code for task #79631.
See merge request easycorp/zentaopms!6598
|
2022-12-20 02:43:00 +00:00 |
|
|
wangzemei
|
7719edcc82
|
Merge br* code format
|
2022-12-20 10:42:26 +08:00 |
|
|
wangzemei
|
d8f1380aa4
|
Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_wzm_79625
|
2022-12-20 10:22:03 +08:00 |
|
|
caoyanyi
|
17a61a108f
|
* Modify font size.
|
2022-12-20 10:21:23 +08:00 |
|
|
chaideqing
|
b670a052de
|
* Fix feedback1752.
|
2022-12-20 10:10:33 +08:00 |
|
|
wangzemei
|
1868b3155d
|
* finish task 79625
|
2022-12-20 09:59:43 +08:00 |
|
|
caoyanyi
|
3a396e0a9c
|
* Code for task #79631.
|
2022-12-20 09:38:31 +08:00 |
|
|
田淑杰
|
c5925821b0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272
|
2022-12-20 09:37:03 +08:00 |
|
|
wangzemei
|
6b8c4daf06
|
* add modal
|
2022-12-20 09:33:25 +08:00 |
|
|
caoyanyi
|
7859132611
|
* Modify font color.
|
2022-12-20 09:26:42 +08:00 |
|