Commit Graph
151 Commits
Author SHA1 Message Date
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
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
liumengyi 6962349356 * Refactor sql based on zentao.sql. 2023-04-21 14:28:09 +08:00
liumengyi 46ba83b24f * Fix bug. 2023-04-21 13:43:50 +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
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
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
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
liumengyi 01ffcbef5d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-20 15:22:32 +08:00
liugang 5510129959 * Fix sql error. 2023-04-20 05:17:48 +00:00
liugang ea5783a908 * Fix sql error. 2023-04-20 05:16:24 +00:00
liugang c5d5b9495c * Fix sql error - change comma to semicolon. 2023-04-20 05:09:08 +00:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
hufangzhou 434ef6ef89 * Set traincourse's parent to traincourse view. 2023-04-20 12:22:15 +08:00
朱金勇 d125177bcf * Fix bug#34425. 2023-04-20 04:14:08 +00:00
朱金勇 366699d74d * Fix bug#34424. 2023-04-20 03:59:12 +00:00
朱金勇 bd3e9172c2 * Fix bug#34427. 2023-04-20 03:56:25 +00:00
朱金勇 f91b05b309 * Fix bug#34444. 2023-04-20 03:44:43 +00:00
朱金勇 a475e8575c * Fix bug#34396. 2023-04-20 03:26:36 +00:00
朱金勇 d2f7cdbad8 * Fix bug#34411. 2023-04-20 03:18:11 +00:00
朱金勇 cb2c15ac07 * Fix bug#34447. 2023-04-20 03:05:35 +00:00
hufangzhou 3af9d0d631 * Put the priv sql to zentao.sql. 2023-04-20 10:27:49 +08:00
朱金勇 93aa3e307b * Format zentao.sql. 2023-04-20 02:17:53 +00:00
朱金勇 f10b648f46 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 01:32:36 +00:00
朱金勇 5f1709a8b4 * Fix bug#34399. 2023-04-20 01:30:08 +00:00
wangyuting2 b7483833ad * Adjust chart title. 2023-04-20 09:16:43 +08:00
朱金勇 179680c361 * Fix bug#34409. 2023-04-20 01:05:36 +00:00
朱金勇 aa6cd2f1ff * Fix bug#34435. 2023-04-20 00:33:10 +00:00
liumengyi 19870de8a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 17:23:44 +08:00
wangyuting2 8b61baa674 * Fix sql bug. 2023-04-19 17:08:50 +08:00
wangyuting2 f56ef584e7 * Fix sql bug. 2023-04-19 17:05:46 +08:00
wangyuting2 9abf81abb7 * Fix update sql bug. 2023-04-19 16:52:34 +08:00
宋辰轩 4a17fc7e7a *Modify chart group. 2023-04-19 16:41:28 +08:00
hufangzhou 438c55d059 * Merge code. 2023-04-19 16:18:56 +08:00
hufangzhou e1def95447 * Merge privilege sql. 2023-04-19 15:49:28 +08:00