Commit Graph
54886 Commits
Author SHA1 Message Date
朱金勇 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
刘刚 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
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
王怡栋 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
王怡栋 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
guofeilong 8dd356b7e1 * Code for delete emtpy lines . 2023-04-21 14:38:28 +08:00
liumengyi 6962349356 * Refactor sql based on zentao.sql. 2023-04-21 14:28:09 +08:00
wangyidong 36889a4ea2 * fix bug. 2023-04-21 14:20:43 +08:00
wangyidong 48aa1ce2f7 * fix bug. 2023-04-21 14:02:24 +08:00
hufangzhou 5088fb54b2 * Rename the standard sql filename. 2023-04-21 13:52:28 +08:00
刘刚 24f40ceb4d Merge branch 'daitingting_bug_#34553' into 'master'
* Fix bug #34553.

See merge request easycorp/zentaopms!7543
2023-04-21 05:50:17 +00:00
liumengyi 286066b29b * Add ',' for sql. 2023-04-21 13:44:35 +08:00
liumengyi 7a46f976f4 Merge branch 'cyy_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-21 13:44:02 +08:00
caoyanyi bfe3d84233 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-21 13:43:52 +08:00
liumengyi 46ba83b24f * Fix bug. 2023-04-21 13:43:50 +08:00
caoyanyi e711f42d69 * Modify install database set. 2023-04-21 13:43:23 +08:00
王怡栋 fa40f834ac Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!7542
2023-04-21 05:40:52 +00:00
hufangzhou ce26c10dea * Remove the secret. 2023-04-21 13:39:39 +08:00
王怡栋 2197f4ab32 Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug

See merge request easycorp/zentaopms!7539
2023-04-21 05:39:02 +00:00
hufangzhou e0d28390ab * Add the new version. 2023-04-21 13:35:49 +08:00
刘刚 ad47f232ae Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#34063 again.

See merge request easycorp/zentaopms!7541
2023-04-21 05:33:25 +00:00
qixinzhi 4791f83177 * Fix bug#34063 again. 2023-04-21 05:29:53 +00:00
liumengyi 58cc0d9b38 * Refactor sql. 2023-04-21 13:27:01 +08:00