Commit Graph
46481 Commits
Author SHA1 Message Date
zhujinyong b4d4e33e23 + Add getColumns function for dao. 2022-11-09 15:44:49 +08:00
liugang 4d8529153f * Fix syntax error. 2022-11-09 15:36:02 +08:00
liugang c8df5b435f * Save report module to the collector field. 2022-11-09 15:35:21 +08:00
宋辰轩 83854baa14 *Remove unused sql. 2022-11-09 10:13:23 +08:00
liugang beb32b483c * Set dimension as root. 2022-11-09 09:52:27 +08:00
liugang 1d659c90ca * Refactor function to add default modules and process report modules. 2022-11-09 09:46:52 +08:00
liugang f5e453c1cd * Add default modules of report and process report modules when upgrade. 2022-11-08 14:49:53 +08:00
zhujinyong 138b1753d6 Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:42:02 +08:00
zhujinyong 867a43f0ed - Remove body style of antd. 2022-11-08 14:41:34 +08:00
liugang 6c915bb8c2 * Finish task #75077. 2022-11-08 14:22:18 +08:00
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
宋辰轩 d84d4a26c4 * Delete unused sql. 2022-11-08 13:49:10 +08:00
宋辰轩 3ba24349eb * Modify sql. 2022-11-08 13:03:55 +08:00
liumengyi 9c1f8b2be1 * Fix bug #29325. 2022-11-08 13:02:01 +08:00
宋辰轩 cb56e049e6 * Modify sql for 18-7. 2022-11-08 10:50:17 +08:00
liumengyi 603162373c Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 10:38:41 +08:00
liumengyi e4d32ca254 * Finish task #75528. 2022-11-08 10:38:05 +08:00
liugang 39f4ea0e7a * Finish task #75169. 2022-11-08 10:36:53 +08:00
朱金勇 39bee976e5 Merge branch 'sprint/fix-api' into 'master'
* Fix missing requireFields error.

See merge request easycorp/zentaopms!6066
2022-11-07 09:14:13 +00:00
鲁飞 b8619da3a6 * Fix missing requireFields error. 2022-11-07 09:14:12 +00:00
朱金勇 b3917c280d Merge branch 'sprint/add-taskrestart' into 'master'
* Support task restart api.

See merge request easycorp/zentaopms!6067
zentaopms_17.8
2022-11-07 08:59:03 +00:00
孙广明 3dc995919d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #29363

See merge request easycorp/zentaopms!6069
2022-11-07 08:52:12 +00:00
lanzongjun 1e16357fe3 * fix bug #29363 2022-11-07 16:50:51 +08:00
宋辰轩 f7e48d94f3 Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-07 16:46:38 +08:00
宋辰轩 42e445c48d * Modify sql field. 2022-11-07 16:46:34 +08:00
Yagami 6413f85918 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-07 16:37:35 +08:00
Yagami 7f1ac56f29 * Fix bug #29369. 2022-11-07 16:36:58 +08:00
孙广明 c48e66ede3 Merge branch 'sprint/biz18_liumengyi_fixbug' into 'sprint/biz17'
* Fix bug for init chart.

See merge request easycorp/zentaopms!6068
2022-11-07 08:33:12 +00:00
liumengyi 5e9f255e14 * Fix bug for init chart. 2022-11-07 16:27:53 +08:00
宋辰轩 a25727d923 * Update sql. 2022-11-07 16:07:02 +08:00
Lufei 3e69145e58 * Support task restart api. 2022-11-07 15:31:18 +08:00
孙广明 0d9ca308b0 Merge branch 'lyk_feedback_1380' into 'master'
* Resolve feedback #1380.

See merge request easycorp/zentaopms!6065
2022-11-07 07:21:41 +00:00
李玉春 62349c46b3 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #29376.

See merge request easycorp/zentaopms!6064
2022-11-07 07:18:18 +00:00
李玉春 624bfcbeed Merge branch 'sprint/tianshujie_css' into 'master'
Sprint/tianshujie css

See merge request easycorp/zentaopms!6061
2022-11-07 07:17:15 +00:00
liuyongkai 50e118bea4 * Resolve feedback #1380. 2022-11-07 07:16:14 +00:00
tianshujie f6d526d916 * Fix bug #29376. 2022-11-07 15:12:30 +08:00
孙广明 15f7a8c486 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356.

See merge request easycorp/zentaopms!6063
2022-11-07 06:57:52 +00:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00
孙广明 8e4fe47631 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#29356,#29168.

See merge request easycorp/zentaopms!6062
2022-11-07 06:41:47 +00:00
caoyanyi 4e7bee9d32 Merge branch 'master' into sprint/tianshujie_css 2022-11-07 14:36:24 +08:00
李玉春 9030b0e194 Merge branch 'cyy_bug' into 'master'
* Fix bug #29355.

See merge request easycorp/zentaopms!6059
2022-11-07 06:35:30 +00:00
xieqiyu 3056c3d98b * Fix bug#29356,#29168. 2022-11-07 06:35:17 +00:00
李玉春 04794398fa Merge branch 'sprint/wangzemei/29345' into 'master'
* fix bug 29345

See merge request easycorp/zentaopms!6060
2022-11-07 06:32:47 +00:00
tianshujie 941a2e5a59 * Fix bug #29347. 2022-11-07 14:31:29 +08:00
wangzemei 261eb124ae * fix bug 29345 2022-11-07 13:51:53 +08:00
caoyanyi dcdc7bd58a * Adjust code. 2022-11-07 13:49:12 +08:00
caoyanyi e6cbdb8182 * Fix bug #28992. 2022-11-07 13:44:11 +08:00
tianshujie 32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
wangzemei 8e5e468431 * Optimizing theme styles 2022-11-07 13:26:53 +08:00
caoyanyi 43ca7832f9 * Fix bug #29355. 2022-11-07 13:16:57 +08:00