 tianshujie
|
e1cff545d6
|
* Fix bug #34676.
|
2023-04-24 14:31:31 +08:00 |
|
|
tianshujie
|
831932222b
|
* Fix bug #34676.
|
2023-04-24 14:24:59 +08:00 |
|
|
tianshujie
|
cea07f16b6
|
* Fix bug #34671.
|
2023-04-24 13:48:24 +08:00 |
|
|
tianshujie
|
1a5321ee1a
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 11:27:38 +08:00 |
|
|
tianshujie
|
03d8023952
|
* Fix bug #34654.
|
2023-04-24 11:27:26 +08:00 |
|
|
xieqiyu
|
7527b808bb
|
* Code for bug#34621.
|
2023-04-24 02:01:32 +00:00 |
|
|
liugang
|
c060a26fcd
|
* Fix sql error.
|
2023-04-24 01:44:35 +00:00 |
|
|
tianshujie
|
4f7be5c494
|
* Modifying SQL errors.
|
2023-04-24 09:09:37 +08:00 |
|
|
hufangzhou
|
ff2824a005
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 08:13:57 +08:00 |
|
|
王怡栋
|
4cf9bdb506
|
Merge branch 'cyy_fixbug' into '18.4'
Cyy fixbug
See merge request easycorp/zentaopms!7558
|
2023-04-23 10:03:38 +00:00 |
|
|
ci
|
53b9008033
|
Merge branch 'master' into 18.4
|
2023-04-23 18:02:52 +08:00 |
|
|
ci
|
59573900a6
|
* Revert the code.
|
2023-04-23 17:30:56 +08:00 |
|
|
朱金勇
|
2ed6472bc8
|
Merge branch 'fix_safe_notice' into 'master'
* Fix notice switch error in admin safe page.
See merge request easycorp/zentaopms!7557
|
2023-04-23 08:00:43 +00:00 |
|
|
Lufei
|
99f7f62456
|
* Fix notice switch error in admin safe page.
|
2023-04-23 15:51:35 +08:00 |
|
|
刘刚
|
8792d9217e
|
Merge branch 'daitingting_bug_#34576' into 'master'
* Fix bug #34576.
See merge request easycorp/zentaopms!7555
|
2023-04-23 03:27:29 +00:00 |
|
|
daitingting
|
ddf2339b06
|
* Fix bug #34576.
|
2023-04-23 11:26:27 +08:00 |
|
|
王怡栋
|
793eab88b4
|
Merge branch 'hufangzhou_bug_31818' into '18.4'
* Fix bug #31818.
See merge request easycorp/zentaopms!7554
|
2023-04-23 03:04:47 +00:00 |
|
|
tianshujie
|
965b868fdb
|
* Fix bug #34604.
|
2023-04-23 10:58:58 +08:00 |
|
|
tianshujie
|
f18cde5955
|
* Fix bug #34601.
|
2023-04-23 10:58:23 +08:00 |
|
|
刘刚
|
3354e5edf9
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix bug #34582.
See merge request easycorp/zentaopms!7553
|
2023-04-21 08:53:46 +00:00 |
|
|
刘刚
|
323ad9c04b
|
Merge branch 'dev/gfl_fixbug' into 'master'
* Code for bug #34552 .
See merge request easycorp/zentaopms!7552
|
2023-04-21 08:52:03 +00:00 |
|
|
hufangzhou
|
92175b0f48
|
* Fix bug #31818.
|
2023-04-21 16:51:39 +08:00 |
|
|
wangyuting2
|
78daa4faef
|
* Fix bug #34582.
|
2023-04-21 16:49:52 +08:00 |
|
|
liugang
|
9434e3f438
|
* Merge the functions extended in biz.
|
2023-04-21 08:45:00 +00:00 |
|
|
liugang
|
08f856a1ab
|
* Move the function from biz extension.
|
2023-04-21 08:44:39 +00:00 |
|
|
刘刚
|
0f0342b10a
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7549
|
2023-04-21 08:43:11 +00:00 |
|
|
guofeilong
|
92157e7236
|
* Code for bug #34552 .
|
2023-04-21 16:41:44 +08:00 |
|
|
caoyanyi
|
352eb6f504
|
* Modify date default value.
|
2023-04-21 16:34:10 +08:00 |
|
|
王怡栋
|
c728da786e
|
Merge branch 'cyy_fixbug' into 'master'
* Change date NOT NULL to date NULL.
See merge request easycorp/zentaopms!7551
|
2023-04-21 08:33:26 +00:00 |
|
|
caoyanyi
|
acba9f604c
|
Merge branch 'cyy_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-21 16:32:30 +08:00 |
|
|
王怡栋
|
95ef308a61
|
Merge branch 'dev/gfl_fixbug' into 'master'
* Adjust code for bug #34552 .
See merge request easycorp/zentaopms!7550
|
2023-04-21 08:32:26 +00:00 |
|
|
liumengyi
|
f31a870c32
|
* Change date NOT NULL to date NULL.
|
2023-04-21 16:31:39 +08:00 |
|
|
guofeilong
|
be9ab3d8e0
|
* Adjust code for bug #34552 .
|
2023-04-21 16:31:13 +08:00 |
|
|
王怡栋
|
7a8b9d13c5
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7548
|
2023-04-21 07:59:25 +00:00 |
|
|
王怡栋
|
98570ddf8b
|
Merge branch 'dev/gfl_fixbug' into 'master'
* Code for bug # 34524 .
See merge request easycorp/zentaopms!7547
|
2023-04-21 07:59:06 +00:00 |
|
|
wangyuting2
|
1ef6a08016
|
* Fix langs bug.
|
2023-04-21 15:49:06 +08:00 |
|
|
guofeilong
|
956a320141
|
* Adjust code for bug #34524 .
|
2023-04-21 15:37:54 +08:00 |
|
|
wangyuting2
|
db1cf716f8
|
* Fix bug.
|
2023-04-21 15:34:42 +08:00 |
|
|
guofeilong
|
dc050c72d9
|
* Code for bug #34524.
|
2023-04-21 15:34:36 +08:00 |
|
|
caoyanyi
|
7b4491f985
|
* Modify install sql.
|
2023-04-21 15:31:10 +08:00 |
|
|
guofeilong
|
f17df69fa2
|
* Code for bug # 34524 .
|
2023-04-21 15:12:38 +08:00 |
|
|
caoyanyi
|
2451dbc421
|
* Fix bug #34590.
|
2023-04-21 14:55:41 +08:00 |
|
|
王怡栋
|
27df34722b
|
Merge branch 'dev/gfl_fixbug' into 'master'
* Code for fix } mistake .
See merge request easycorp/zentaopms!7546
|
2023-04-21 06:48:42 +00:00 |
|
|
guofeilong
|
2b50e7bd38
|
* Code for fix } mistake .
|
2023-04-21 14:47:37 +08:00 |
|
|
caoyanyi
|
bc54b04257
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-21 14:44:01 +08:00 |
|
|
王怡栋
|
3e45ac60db
|
Merge branch 'dev/gfl_fixbug' into 'master'
Dev/gfl fixbug
See merge request easycorp/zentaopms!7545
|
2023-04-21 06:43:55 +00:00 |
|
|
caoyanyi
|
4be7f200dd
|
* Fix bug #34574.
|
2023-04-21 14:43:36 +08:00 |
|
|
王怡栋
|
8d2dcf22e0
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7544
|
2023-04-21 06:39:25 +00:00 |
|
|
guofeilong
|
e3245bf03c
|
* Code for adjust title width js .
|
2023-04-21 14:38:47 +08:00 |
|
|
guofeilong
|
6ac8651e73
|
* Code for hide scroll in view .
|
2023-04-21 14:38:28 +08:00 |
|