 王怡栋
|
de8493412a
|
Merge branch 'cyy_bug' into 'master'
* Modify job edit error tip.
See merge request easycorp/zentaopms!6689
|
2023-01-05 02:55:34 +00:00 |
|
|
田淑杰
|
5ecaa57043
|
* Fix bug #31470.
|
2023-01-05 10:13:34 +08:00 |
|
|
caoyanyi
|
459f1ae27d
|
* Fix bug #31469.
|
2023-01-05 09:58:49 +08:00 |
|
|
caoyanyi
|
b758139f9b
|
* Modify vision switch.
|
2023-01-04 15:27:10 +08:00 |
|
|
caoyanyi
|
8ac4dc8fd4
|
Merge branch 'master' into cyy_bug
|
2023-01-04 09:34:04 +08:00 |
|
|
caoyanyi
|
c853331163
|
* Modify admin user check.
|
2023-01-04 09:33:08 +08:00 |
|
|
caoyanyi
|
c3f8d4873f
|
* Fix bug #31397.
|
2023-01-03 17:09:58 +08:00 |
|
|
王怡栋
|
62d60df7bd
|
Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.
See merge request easycorp/zentaopms!6668
|
2023-01-03 06:09:21 +00:00 |
|
|
hufangzhou
|
b5859c7dc3
|
* Add the new version.
|
2023-01-03 13:56:27 +08:00 |
|
|
孙广明
|
c29776bbfe
|
Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug
See merge request easycorp/zentaopms!6667
|
2023-01-03 05:54:09 +00:00 |
|
|
王怡栋
|
aef16e3c83
|
Merge branch 'sprint/gfl_task_40825' into 'master'
* code for task #40827
See merge request easycorp/zentaopms!6659
|
2023-01-03 01:54:28 +00:00 |
|
|
tianshujie
|
a2f27fe5d5
|
* Fix bug #30557.
|
2023-01-03 08:43:08 +08:00 |
|
|
wangyidong
|
ccec9bcc16
|
Merge branch 'zentaopms279'
|
2023-01-03 08:39:33 +08:00 |
|
|
tianshujie
|
e11298c33b
|
* code for task #40827
|
2022-12-30 17:32:05 +08:00 |
|
|
tianshujie
|
41dd1a0280
|
* code for task #40827
|
2022-12-30 16:47:15 +08:00 |
|
|
caoyanyi
|
597b11524f
|
* Modify text style.
|
2022-12-30 15:09:44 +08:00 |
|
|
wangyidong
|
7c3958183f
|
* code for task #81412,81413.
|
2022-12-29 15:33:40 +08:00 |
|
|
tianshujie
|
a1fe18b99d
|
* code for bug #81093
|
2022-12-29 15:17:18 +08:00 |
|
|
tianshujie
|
2ed3974bc6
|
* code for bug #81093
|
2022-12-29 15:14:34 +08:00 |
|
|
wangyidong
|
56c5cac759
|
* code for task #81410.
|
2022-12-28 14:32:22 +08:00 |
|
|
caoyanyi
|
15ea4e0e22
|
* Optimize page style.
|
2022-12-22 16:24:43 +08:00 |
|
|
wangzemei
|
f2cb91a66b
|
* fix css
|
2022-12-22 15:15:36 +08:00 |
|
|
wangzemei
|
4af98c110d
|
* fix bug
|
2022-12-22 14:37:21 +08:00 |
|
|
wangzemei
|
81edf30213
|
* fix bug 31123
|
2022-12-22 14:23:39 +08:00 |
|
|
caoyanyi
|
b5092a22dd
|
* Fix bug #31133.
|
2022-12-22 12:25:56 +08:00 |
|
|
曹延义
|
7074488133
|
* Fix bug #31126.
|
2022-12-22 04:13:32 +00:00 |
|
|
caoyanyi
|
2934b892af
|
* Modify system mode check.
|
2022-12-21 21:45:08 +08:00 |
|
|
tianshujie
|
a3bccd0eff
|
* code for task 79627
|
2022-12-21 19:44:02 +08:00 |
|
|
wangzemei
|
d98f999afa
|
* Modify picture display
|
2022-12-21 16:16:57 +08:00 |
|
|
田淑杰
|
68bc0ba488
|
* Finish task #79635.
|
2022-12-21 16:12:30 +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 |
|
|
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 |
|
|
田淑杰
|
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 |
|
|
田淑杰
|
7aff4d599e
|
* Fixed positioning issues of guide block.
|
2022-12-21 10:17:32 +08:00 |
|
|
caoyanyi
|
00a774e19e
|
* Modify page reload.
|
2022-12-21 09:11:06 +08:00 |
|
|
caoyanyi
|
1192ea3680
|
* Modify page position.
|
2022-12-20 21:01:56 +08:00 |
|
|
田淑杰
|
00a8e6317a
|
* Refactor.
|
2022-12-20 14:53:46 +08:00 |
|
|
田淑杰
|
cbd8fa5706
|
* Refactor.
|
2022-12-20 14:06:30 +08:00 |
|