 guofeilong
|
24d59a3ef8
|
* code for handle confilct
|
2023-02-02 09:22:28 +08:00 |
|
|
wangyidong
|
3dacf0c938
|
* code for admin menu.
|
2023-02-02 09:18:49 +08:00 |
|
|
caoyanyi
|
fdec4693a3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-02 09:10:56 +08:00 |
|
|
caoyanyi
|
0395e9266d
|
* Modify lite vision system style.
|
2023-02-02 09:10:15 +08:00 |
|
|
hufangzhou
|
3d4ae057f3
|
* Fix bug for bug #30770.
|
2023-02-02 01:08:42 +00:00 |
|
|
孙广明
|
59a70a4a00
|
Merge branch 'songpeiyan_bug#30856' into 'master'
*Fix bug #30856
See merge request easycorp/zentaopms!6829
|
2023-02-02 00:46:04 +00:00 |
|
|
songpeiyan
|
bdd962fe94
|
* Fix bug #30856
|
2023-02-02 08:43:27 +08:00 |
|
|
guofeilong
|
c86bc8f8a5
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327
|
2023-02-02 08:29:30 +08:00 |
|
|
guofeilong
|
96aa9e19b1
|
* handle conflict
|
2023-02-01 17:21:33 +08:00 |
|
|
wangyidong
|
95dcbf524e
|
* code for task #83434.
|
2023-02-01 17:21:14 +08:00 |
|
|
王怡栋
|
182ce3e6a3
|
Merge branch 'master_xieqiyu_30144' into 'master'
* Fix bug#30144.
See merge request easycorp/zentaopms!6826
|
2023-02-01 09:16:20 +00:00 |
|
|
王怡栋
|
0be2cc5302
|
Merge branch 'master_xieqiyu_31864' into 'master'
* Fix bug#31864.
See merge request easycorp/zentaopms!6824
|
2023-02-01 09:15:40 +00:00 |
|
|
王怡栋
|
78c6c67a55
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!6823
|
2023-02-01 09:15:12 +00:00 |
|
|
王怡栋
|
6da21196a9
|
Merge branch 'master_xieqiyu_30280' into 'master'
* Fix bug#30280.
See merge request easycorp/zentaopms!6822
|
2023-02-01 09:14:21 +00:00 |
|
|
王怡栋
|
5340535915
|
Merge branch 'sprint/hufangzhou_bug_30770' into 'master'
* Fix bug #30770.
See merge request easycorp/zentaopms!6830
|
2023-02-01 09:12:24 +00:00 |
|
|
wangyidong
|
85bcf30edf
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-01 17:07:24 +08:00 |
|
|
wangyidong
|
96e8ac519d
|
* code for task #83438.
|
2023-02-01 17:05:41 +08:00 |
|
|
caoyanyi
|
2ef5fe6d4a
|
* Add language.
|
2023-02-01 16:58:39 +08:00 |
|
|
guofeilong
|
1010f30ae3
|
* code for disabled in setting-box
|
2023-02-01 16:55:29 +08:00 |
|
|
hufangzhou
|
0e00ce3a8f
|
* Fix bug #30770.
|
2023-02-01 08:50:39 +00:00 |
|
|
songpeiyan
|
b1927d4cd2
|
*Fix bug #30856
|
2023-02-01 16:46:42 +08:00 |
|
|
孙广明
|
33c29fb324
|
Merge branch 'lyk_ticket_2072' into 'master'
* Resolve ticket #2072.
See merge request easycorp/zentaopms!6828
|
2023-02-01 08:39:40 +00:00 |
|
|
liuyongkai
|
3dfb278fc4
|
* Resolve ticket #2072.
|
2023-02-01 16:37:24 +08:00 |
|
|
孙广明
|
beec1cc222
|
Merge branch 'lyk_ticket_2072' into 'master'
* Resolve ticket #2072.
See merge request easycorp/zentaopms!6827
|
2023-02-01 08:35:42 +00:00 |
|
|
caoyanyi
|
5db8511efc
|
* Adjust code.
|
2023-02-01 16:35:28 +08:00 |
|
|
caoyanyi
|
fd57156a90
|
* Optimize admin switcher style.
|
2023-02-01 16:33:39 +08:00 |
|
|
liuyongkai
|
438fb830e5
|
* Resolve ticket #2072.
|
2023-02-01 16:32:48 +08:00 |
|
|
xieqiyu
|
770750c9db
|
* Fix bug#30144.
|
2023-02-01 16:23:59 +08:00 |
|
|
guofeilong
|
5524568d34
|
* code for add pd-left to icon
|
2023-02-01 16:19:46 +08:00 |
|
|
guofeilong
|
7b516288a6
|
* code for change icon: font-size
|
2023-02-01 16:18:28 +08:00 |
|
|
guofeilong
|
547d866734
|
* code for css in without Internet
|
2023-02-01 16:10:27 +08:00 |
|
|
caoyanyi
|
7595e90004
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-01 16:01:23 +08:00 |
|
|
caoyanyi
|
bfb0c22484
|
* Optimize page style.
|
2023-02-01 16:00:45 +08:00 |
|
|
孙广明
|
fd06ece2f1
|
Merge branch 'songpeiyan_bug#30079' into 'master'
Songpeiyan bug#30079
See merge request easycorp/zentaopms!6825
|
2023-02-01 07:57:41 +00:00 |
|
|
孙广明
|
95972539ab
|
Merge branch 'songpeiyan_bug#31558' into 'master'
* Fix bug #31558.
See merge request easycorp/zentaopms!6821
|
2023-02-01 07:56:43 +00:00 |
|
|
songpeiyan
|
bfa6c4bd29
|
Fix bug #30079
|
2023-02-01 15:48:45 +08:00 |
|
|
songpeiyan
|
b1d3eb75f8
|
*Fix bug #30079
|
2023-02-01 15:41:00 +08:00 |
|
|
wangyidong
|
de17879c59
|
* code for task #83436.
|
2023-02-01 15:37:07 +08:00 |
|
|
xieqiyu
|
bbf3f25c27
|
* Fix bug#31864.
|
2023-02-01 15:28:05 +08:00 |
|
|
wangyidong
|
84905c803d
|
* code for task #83428.
|
2023-02-01 15:05:58 +08:00 |
|
|
caoyanyi
|
78290d812f
|
* Optimize class style.
|
2023-02-01 14:50:02 +08:00 |
|
|
guofeilong
|
0400058454
|
* code for add css
|
2023-02-01 14:43:39 +08:00 |
|
|
xieqiyu
|
859dbbc471
|
* Fix bug#30280.
|
2023-02-01 14:32:18 +08:00 |
|
|
songpeiyan
|
f8eba3cc9b
|
* Fix bug #31558.
|
2023-02-01 14:30:43 +08:00 |
|
|
王怡栋
|
84ea957712
|
Merge branch 'master_xieqiyu_30834' into 'master'
* Fix bug#30834.
See merge request easycorp/zentaopms!6820
|
2023-02-01 06:28:30 +00:00 |
|
|
王怡栋
|
3c316330d1
|
Merge branch 'master_xieqiyu_30859' into 'master'
* Fix bug#30859.
See merge request easycorp/zentaopms!6819
|
2023-02-01 06:28:14 +00:00 |
|
|
王怡栋
|
fb0ffba7a2
|
Merge branch 'master_xieqiyu_31366' into 'master'
* Fix bug#31366.
See merge request easycorp/zentaopms!6818
|
2023-02-01 06:27:20 +00:00 |
|
|
王怡栋
|
a02b41962e
|
Merge branch 'zentaopms284_wangyuting' into 'master'
* Adjust modal width.
See merge request easycorp/zentaopms!6815
|
2023-02-01 06:26:48 +00:00 |
|
|
王怡栋
|
0933b65d15
|
Merge branch 'zentaopms_284_task_#83032' into 'master'
* Finish task #83032.
See merge request easycorp/zentaopms!6813
|
2023-02-01 06:26:36 +00:00 |
|
|
王怡栋
|
0e18e97a06
|
Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
Dev/gfl task #83327
See merge request easycorp/zentaopms!6814
|
2023-02-01 06:25:33 +00:00 |
|