Commit Graph
2092 Commits
Author SHA1 Message Date
wangyuting2 218b70f8c3 * Fix upgrade bug. 2023-04-27 10:16:05 +08:00
caoyanyi f65572c2f7 * Modify update sql. 2023-04-26 20:55:20 +08:00
hufangzhou 1e8d71c001 * Fix bug #34840. 2023-04-26 14:11:43 +08:00
hufangzhou e4bdf5da89 * Fix bug #34827. 2023-04-26 10:45:12 +08:00
tianshujie 09fa216c5d * Fix bug #34837. 2023-04-26 10:31:32 +08:00
daitingting c251f7d078 * Move it to biz. 2023-04-25 17:07:16 +08:00
daitingting 809c08be10 * Add defautl pivot tables. 2023-04-25 10:59:36 +08:00
tianshujie cc256db992 * Fix bug #34710. 2023-04-24 16:35:36 +08: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
王怡栋 4cf9bdb506 Merge branch 'cyy_fixbug' into '18.4'
Cyy fixbug

See merge request easycorp/zentaopms!7558
2023-04-23 10:03:38 +00:00
tianshujie 965b868fdb * Fix bug #34604. 2023-04-23 10:58:58 +08:00
wangyuting2 78daa4faef * Fix bug #34582. 2023-04-21 16:49:52 +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
liumengyi f31a870c32 * Change date NOT NULL to date NULL. 2023-04-21 16:31:39 +08:00
caoyanyi 7b4491f985 * Modify install sql. 2023-04-21 15:31:10 +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
liumengyi 6962349356 * Refactor sql based on zentao.sql. 2023-04-21 14:28:09 +08:00
hufangzhou 5088fb54b2 * Rename the standard sql filename. 2023-04-21 13:52:28 +08: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
liumengyi 46ba83b24f * Fix bug. 2023-04-21 13:43:50 +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 e0d28390ab * Add the new version. 2023-04-21 13:35:49 +08:00
liumengyi 58cc0d9b38 * Refactor sql. 2023-04-21 13:27:01 +08:00
caoyanyi b4e830a360 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-21 11:18:48 +08:00
caoyanyi 69489480ad * Add a field default value. 2023-04-21 11:15:20 +08:00
hufangzhou d1ef10c951 * Completion of language items. 2023-04-21 10:46:06 +08:00
caoyanyi 90262bcead * Fix bug #34482. 2023-04-21 10:07:04 +08:00
刘刚 e69f47c233 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
Zentaobiz39 bi wangyuting

See merge request easycorp/zentaopms!7530
2023-04-21 02:05:43 +00:00
hufangzhou 05a3165b2a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-21 09:49:38 +08:00
hufangzhou 2170647ab8 * Add the fields name for replace sql. 2023-04-21 09:49:26 +08:00
wangyuting2 807fac723a * Show pivot for zentao open version. 2023-04-21 09:35:17 +08:00
daitingting 0c6bad428a * Fix bug. 2023-04-21 09:11:04 +08:00
hufangzhou fb3c888626 * Fix bug for priv fields. 2023-04-21 08:27:21 +08:00
刘刚 560cd6f61e Merge branch 'tsj_fixbug' into 'master'
* Modify default value.

See merge request easycorp/zentaopms!7521
2023-04-20 09:44:17 +00:00
刘刚 2a0661d59d Merge branch 'daitingting_upgrade' into 'master'
* Process privelege for dataview.

See merge request easycorp/zentaopms!7520
2023-04-20 09:44:02 +00:00
刘刚 303e17a25c Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix db bug.

See merge request easycorp/zentaopms!7517
2023-04-20 09:42:42 +00:00
王怡栋 b540679939 Merge branch 'tsj_fixbug' into 'master'
* Add a field default.

See merge request easycorp/zentaopms!7519
2023-04-20 09:32:43 +00:00
caoyanyi f450ee8aa9 * Modify default value. 2023-04-20 17:32:30 +08:00
daitingting b19b86f789 * Process privelege for dataview. 2023-04-20 17:31:28 +08:00
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00
caoyanyi 6a95890f77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-20 17:27:29 +08:00
caoyanyi c49f559d09 * Add a field default. 2023-04-20 17:19:24 +08:00
wangyuting2 0e3fb627e0 * Fix db bug. 2023-04-20 17:01:10 +08:00
hufangzhou 8c06cac8aa * Fix bug. 2023-04-20 16:55:10 +08:00
刘刚 833fd65fbd Merge branch 'tsj_fixbug' into 'master'
* Modify the installation SQL.

See merge request easycorp/zentaopms!7514
2023-04-20 08:48:17 +00:00
caoyanyi 69d294280a * Modify the installation SQL. 2023-04-20 16:39:16 +08:00