Commit Graph
54864 Commits
Author SHA1 Message Date
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
caoyanyi 2451dbc421 * Fix bug #34590. 2023-04-21 14:55:41 +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
daitingting 9d8220fdf9 * Fix bug #34553. 2023-04-21 11:31:32 +08:00
caoyanyi e266ad301a * Fix bug #34473. 2023-04-21 11:29:00 +08:00
刘刚 6d327074c9 Merge branch 'master_xieqiyu_update' into 'master'
* Process dataset update.

See merge request easycorp/zentaopms!7540
2023-04-21 03:24:50 +00:00
xieqiyu 1d4726faaf * Process dataset update. 2023-04-21 03:20:34 +00:00
caoyanyi 25a88c88f0 * Adjust code. 2023-04-21 11:19:49 +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 83cf8d0972 * Modify install and story report error. 2023-04-21 11:18:02 +08:00
caoyanyi e2d9b07915 Merge branch 'cyy_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-21 11:16:10 +08:00
刘刚 6a5e525bb8 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7538
2023-04-21 03:15:41 +00:00
caoyanyi 69489480ad * Add a field default value. 2023-04-21 11:15:20 +08:00
刘刚 10ea035d40 Merge branch 'daitingting_bug_#34554' into 'master'
* Fix bug #34554.

See merge request easycorp/zentaopms!7537
2023-04-21 03:12:13 +00:00
wangyuting2 cdec60e1bc * Fix bug. 2023-04-21 11:10:58 +08:00
胡方舟 e7fd81a205 Merge branch 'pipeline_jenkins_ly' into 'master'
* Sonar scan rules filter language files.

See merge request easycorp/zentaopms!7536
2023-04-21 03:10:39 +00:00
daitingting eb61d3c874 * Fix bug #34554. 2023-04-21 11:07:03 +08:00
刘刚 2364aa8f4e Merge branch 'goview' into 'master'
* Fix bug#34178 again.

See merge request easycorp/zentaopms!7535
2023-04-21 03:04:28 +00:00
qixinzhi 2901bf5be6 * Fix bug#34178 again. 2023-04-21 03:00:25 +00:00
liyang 62d853f4c9 * Sonar scan rules filter language files. 2023-04-21 11:00:21 +08:00
tianshujie ebdd8e410d * Change the action button color. 2023-04-21 10:47:46 +08:00
hufangzhou d1ef10c951 * Completion of language items. 2023-04-21 10:46:06 +08:00
caoyanyi 97addfcfb4 * Fix bug #33931. 2023-04-21 10:36:50 +08:00
刘刚 898bad5e3a Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix lang bug.

See merge request easycorp/zentaopms!7534
2023-04-21 02:30:52 +00:00
wangyuting2 a2611624ff * Fix lang bug. 2023-04-21 10:30:01 +08:00