 wangyidong
|
f90041ca48
|
* code for task #83736.
|
2023-02-14 15:55:20 +08:00 |
|
|
caoyanyi
|
53a597e301
|
* Hide holiday import style.
|
2023-02-14 15:26:59 +08:00 |
|
|
tianshujie
|
9df139a83a
|
* Fixed an error in the lite Edition.
|
2023-02-14 14:37:24 +08:00 |
|
|
tianshujie
|
483608b3f7
|
* Fixed incorrect order of tertiary navigation links.
|
2023-02-14 14:31:29 +08:00 |
|
|
wangyidong
|
26f1849bbc
|
* code for task #83739.
|
2023-02-13 16:52:02 +08:00 |
|
|
wangyidong
|
6b0a919b6f
|
* code for task #83737.
|
2023-02-13 15:23:46 +08:00 |
|
|
tianshujie
|
1470d9d851
|
* Fix bug #32057.
|
2023-02-13 14:38:02 +08:00 |
|
|
tianshujie
|
da0ebacef2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-13 08:27:05 +08:00 |
|
|
朱金勇
|
c7c6f541cf
|
Merge branch 'fixbug_liumengyi_importcard' into 'master'
Fixbug liumengyi importcard
See merge request easycorp/zentaopms!6920
|
2023-02-13 00:08:01 +00:00 |
|
|
wangyidong
|
ff66b39a2a
|
* code for task #83736.
|
2023-02-10 17:37:50 +08:00 |
|
|
guofeilong
|
e53c45c256
|
* Code for delete btn-group dom on btn.
|
2023-02-10 16:38:07 +08:00 |
|
|
liumengyi
|
5850589edc
|
* Fix bug #30137.
|
2023-02-10 16:35:45 +08:00 |
|
|
guofeilong
|
bbdad0ad3e
|
* Code for delete 4px in css.
|
2023-02-10 16:30:47 +08:00 |
|
|
liumengyi
|
d71abe0f43
|
* Fix bug #32043.
|
2023-02-10 16:25:49 +08:00 |
|
|
liumengyi
|
32b43bed5e
|
* Fix bug #32041.
|
2023-02-10 16:25:29 +08:00 |
|
|
Yagami
|
397db2aca1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-02-10 15:58:05 +08:00 |
|
|
Yagami
|
e2f9d31254
|
* Fix bugs.
|
2023-02-10 15:57:58 +08:00 |
|
|
王怡栋
|
1d8d34ef6b
|
Merge branch 'master_xieqiyu_32034' into 'master'
* Fix bug#32034.
See merge request easycorp/zentaopms!6918
|
2023-02-10 07:45:44 +00:00 |
|
|
Yagami
|
0436a025bb
|
* Fix bug #32045.
|
2023-02-10 15:45:00 +08:00 |
|
|
guofeilong
|
08ce031a8a
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 15:24:04 +08:00 |
|
|
guofeilong
|
84f801ead2
|
* Code for css refactors.
|
2023-02-10 15:23:59 +08:00 |
|
|
孙广明
|
7c2a65393c
|
Merge branch 'zhouxin_feedback_2176' into 'master'
* Resolve feedback #2176.
See merge request easycorp/zentaopms!6917
|
2023-02-10 07:21:22 +00:00 |
|
|
xieqiyu
|
83635bffc3
|
* Fix bug#32034.
|
2023-02-10 15:18:26 +08:00 |
|
|
zhouxin
|
c725109f45
|
* Resolve feedback #2176.
|
2023-02-10 15:16:13 +08:00 |
|
|
tianshujie
|
dae8b91fe1
|
* Modify the ash logic.
|
2023-02-10 14:33:22 +08:00 |
|
|
王怡栋
|
ca1ff74c60
|
Merge branch 'fixbug_liumengyi_sql' into 'master'
* Add sql.
See merge request easycorp/zentaopms!6916
|
2023-02-10 06:10:47 +00:00 |
|
|
王怡栋
|
009d29f79e
|
Merge branch 'hufangzhou_fixbug' into 'master'
* Modifying the access control of the parent phase does not synchronize the child phase's.
See merge request easycorp/zentaopms!6915
|
2023-02-10 06:10:32 +00:00 |
|
|
hufangzhou
|
17bbda6505
|
* Format the code.
|
2023-02-10 06:09:44 +00:00 |
|
|
caoyanyi
|
3ac7376dc4
|
* Optimize page style.
|
2023-02-10 14:05:00 +08:00 |
|
|
liumengyi
|
6f39d4f87c
|
* Add sql.
|
2023-02-10 13:58:22 +08:00 |
|
|
hufangzhou
|
35bd85a243
|
* Modifying the access control of the parent phase does not synchronize the child phase's.
|
2023-02-10 05:41:06 +00:00 |
|
|
孙广明
|
51135f13f5
|
Merge branch 'zenops_61' into 'master'
* Fix error for php5.3.
See merge request easycorp/zentaopms!6909
|
2023-02-10 05:27:52 +00:00 |
|
|
王怡栋
|
ad7430857e
|
Merge branch 'sprint/cyy_bug' into 'sprint/285'
Sprint/cyy bug
See merge request easycorp/zentaopms!6913
|
2023-02-10 03:31:25 +00:00 |
|
|
王怡栋
|
2d9fe72fae
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix admin model menu bug.
See merge request easycorp/zentaopms!6912
|
2023-02-10 03:31:06 +00:00 |
|
|
王怡栋
|
6c06df5f1e
|
Merge branch 'sprint/285_navigation' into 'sprint/285'
Sprint/285 navigation
See merge request easycorp/zentaopms!6911
|
2023-02-10 03:30:23 +00:00 |
|
|
王怡栋
|
901a64e246
|
Merge branch 'sprint/285_tsj_issue' into 'sprint/285'
* Resolve issue #744.
See merge request easycorp/zentaopms!6908
|
2023-02-10 03:29:34 +00:00 |
|
|
王怡栋
|
cdb87a322f
|
Merge branch 'dev/gfl_fix_style_in_flowChart' into 'master'
Dev/gfl fix style in flow chart
See merge request easycorp/zentaopms!6914
|
2023-02-10 03:29:13 +00:00 |
|
|
guofeilong
|
ef34cdf402
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_fix_style_in_flowChart
|
2023-02-10 11:25:01 +08:00 |
|
|
guofeilong
|
08b3159b3d
|
* Code for fix style problem in flowChart.
|
2023-02-10 11:24:53 +08:00 |
|
|
wangyidong
|
de07d90b19
|
* fix bug #32016.
|
2023-02-10 11:22:34 +08:00 |
|
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
tianshujie
|
0e76cbe2d0
|
Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation
|
2023-02-10 10:55:21 +08:00 |
|
|
guofeilong
|
f578ab069b
|
* Code for task #750
|
2023-02-10 10:53:31 +08:00 |
|
|
guofeilong
|
b5f18edb35
|
* Code for task #748
|
2023-02-10 10:46:00 +08:00 |
|
|
guofeilong
|
a95bb643ed
|
* Code for css task #746.
|
2023-02-10 10:37:49 +08:00 |
|
|
wangyuting2
|
e7a66de47f
|
* Fix admin model menu bug.
|
2023-02-10 10:31:32 +08:00 |
|
|
caoyanyi
|
9ea480e4b8
|
* Add sub menu active.
|
2023-02-10 10:18:38 +08:00 |
|
|
zhaoke
|
6e86ba1ecf
|
* Update action label.
|
2023-02-10 02:18:35 +00:00 |
|
|
wangyidong
|
cb153273d0
|
* adjust for admin set menu.
|
2023-02-10 10:00:37 +08:00 |
|
|
wangyidong
|
0f5ce93307
|
* code for task #83740.
|
2023-02-10 09:57:32 +08:00 |
|