Commit Graph
54316 Commits
Author SHA1 Message Date
朱金勇 f91b05b309 * Fix bug#34444. 2023-04-20 03:44:43 +00:00
朱金勇 119e6fe3f1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 03:26:46 +00:00
朱金勇 a475e8575c * Fix bug#34396. 2023-04-20 03:26:36 +00:00
wangyidong 107265a099 * fix bug for init js var. 2023-04-20 11:25:23 +08:00
朱金勇 f3989ee08c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 03:18:20 +00:00
朱金勇 d2f7cdbad8 * Fix bug#34411. 2023-04-20 03:18:11 +00:00
刘刚 72671bbd67 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Add bi builtin config.

See merge request easycorp/zentaopms!7498
2023-04-20 03:18:00 +00:00
liugang 8a17f4d65f * Enclose MySQL keywords in backticks 2023-04-20 03:15:13 +00:00
wangyuting2 9e88925e14 * Add bi builtin config. 2023-04-20 11:14:54 +08:00
刘刚 668d9689b1 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix chart browse bug.

See merge request easycorp/zentaopms!7497
2023-04-20 03:14:39 +00:00
刘刚 7fcfc0a769 Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33355.

See merge request easycorp/zentaopms!7496
2023-04-20 03:14:32 +00:00
刘刚 75b14759b2 Merge branch 'sprint/scx_updategroup' into 'master'
* Add finish_project_effort_deviation to group.

See merge request easycorp/zentaopms!7495
2023-04-20 03:14:25 +00:00
wangyuting2 e3818f2999 * Fix chart browse bug. 2023-04-20 11:13:04 +08:00
宋辰轩 7d3c84fb73 * Add finish_project_effort_deviation to group. 2023-04-20 11:08:50 +08:00
朱金勇 cb2c15ac07 * Fix bug#34447. 2023-04-20 03:05:35 +00:00
qixinzhi 2dad2fab89 * Fix bug#33355. 2023-04-20 03:04:29 +00:00
朱金勇 ba630dcbff * Fix typo. 2023-04-20 02:35:33 +00:00
朱金勇 ca30397678 * Reset commit. 2023-04-20 02:18:40 +00: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
刘刚 db530935f4 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Adjust chart title.

See merge request easycorp/zentaopms!7493
2023-04-20 01:24:59 +00:00
刘刚 379bddf08c Merge branch 'daitingting_upgrade' into 'master'
* Fix bug for upgrading.

See merge request easycorp/zentaopms!7492
2023-04-20 01:24:46 +00:00
wangyidong 7904c894f4 * remove export btn in api view page. 2023-04-20 09:21:54 +08:00
hufangzhou 687d61e9a2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-20 09:18:35 +08:00
hufangzhou ae29bff2eb * Adjust the pack script file. 2023-04-20 09:18:28 +08:00
wangyidong e151d70698 Merge branch 'dev/gfl_fixbug' 2023-04-20 09:17:13 +08:00
wangyuting2 b7483833ad * Adjust chart title. 2023-04-20 09:16:43 +08:00
王怡栋 27bcdacb34 Merge branch 'master' into 'dev/gfl_fixbug'
# Conflicts:
#   module/doc/css/view.css
2023-04-20 01:16:43 +00:00
王怡栋 da0e2a8129 Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug

See merge request easycorp/zentaopms!7482
2023-04-20 01:15:18 +00:00
caoyanyi ffac4c9567 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-20 09:12:48 +08:00
caoyanyi 3f64a5d2dd * Modify api view page icon. 2023-04-20 09:11:24 +08:00
朱金勇 179680c361 * Fix bug#34409. 2023-04-20 01:05:36 +00:00
caoyanyi e569f98b48 * Modify tree set style. 2023-04-20 09:03:23 +08:00
guofeilong fa65768e1c * Code for bug #34267 . 2023-04-20 08:58:30 +08:00
朱金勇 aa6cd2f1ff * Fix bug#34435. 2023-04-20 00:33:10 +00:00
daitingting d4ae238ed9 * Remove note. 2023-04-19 17:49:23 +08:00
daitingting 5c746f6757 * Fix bug for upgrading. 2023-04-19 17:46:43 +08:00
刘刚 dc38a04f48 Merge branch 'goview' into 'master'
* Updata go-view dist.

See merge request easycorp/zentaopms!7490
2023-04-19 09:23:19 +00:00
qixinzhi e94d290a57 * Updata go-view dist. 2023-04-19 09:20:25 +00:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
刘刚 6212220470 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix sql bug.

See merge request easycorp/zentaopms!7488
2023-04-19 09:09:32 +00: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
caoyanyi 0409894d62 * Modify cookie set. 2023-04-19 17:04:23 +08:00
wangyidong df01ad51ec * fix bug. 2023-04-19 17:03:49 +08:00
王怡栋 d3b188fe84 Merge branch 'dev/gfl_fixbug' into 'master'
* Adjust code for task#91379 .

See merge request easycorp/zentaopms!7487
2023-04-19 08:57:56 +00:00
caoyanyi ae153705d2 * Modify view style. 2023-04-19 16:57:07 +08:00
刘刚 68a6bab36a Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix update sql bug.

See merge request easycorp/zentaopms!7486
2023-04-19 08:53:27 +00:00
wangyuting2 9abf81abb7 * Fix update sql bug. 2023-04-19 16:52:34 +08:00