Commit Graph

967 Commits

Author SHA1 Message Date
田淑杰
866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
hufangzhou
464cd34cd5 * Fix bug for add module. 2022-12-27 01:28:22 +00:00
hufangzhou
3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang
9a89860dc4 * Comment codes. 2022-12-27 08:40:48 +08:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
田淑杰
d6bad0942f * Add update function of task #79622. 2022-12-19 11:11:28 +08:00
hufangzhou
6cef691b39 * Add the new version. 2022-12-14 05:28:51 +00:00
wangyidong
cb5af075f0 * adjust for upgrade. 2022-12-06 17:27:53 +08:00
Lufei
12e1539301 * Fix baseUrl scheme error for api createDemoData. 2022-11-29 18:28:13 +08:00
wangyuting
84f9b7b36a * Fix bug #30193. 2022-11-24 02:12:02 +00:00
liugang
b688d08312 Merge branch 'master' into sprint/biz17 2022-11-23 10:10:30 +08:00
wangyuting
5835a11610 * Fix bug #29994. 2022-11-23 01:40:30 +00:00
liumengyi
a3b23cffcd * Modify bi upgrade method. 2022-11-21 14:01:54 +08:00
liugang
7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
wangyuting
182f1abc9a * Fix bug #30003. 2022-11-21 01:51:24 +00:00
王怡栋
1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
hufangzhou
3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
宋辰轩
97b5a52b78 *Modify default dimension code. 2022-11-16 09:06:14 +08:00
宋辰轩
7594ccbfc1 * Delete sql and update function. 2022-11-14 13:59:31 +08:00
wangyuting
2f5e0ac70d * Finish task #75239. 2022-11-11 00:46:54 +00:00
wangyidong
2e6e289f1a * fix bug #29528. 2022-11-10 12:08:21 +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
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
wangyuting2
b59ceb1038 * Finish task #72273. 2022-11-03 05:28:49 +00:00
hufangzhou
d095daee76 * Add the sql in confirm page. 2022-11-02 08:33:05 +00:00
hufangzhou
b08746ca3c * Fix an error. 2022-11-02 08:06:59 +00:00
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
hufangzhou
d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
hufangzhou
d3f7df5518 * Add the new version. 2022-10-19 05:41:40 +00:00
tanghucheng
ccd017af47 * Finish task #72201,72130,72129. 2022-10-18 15:04:35 +08:00
tanghucheng
36a8194f4c * Remove merge feedback module for tree and upgrade. 2022-10-17 09:05:08 +08:00
wangyidong
91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
王怡栋
fb0ef6c81d Merge branch 'sprint/zentaopms240_bug#27928' into 'sprint/zentaopms240'
* Fix bug #27928.

See merge request easycorp/zentaopms!5623
2022-09-30 00:27:24 +00:00
wangyuting2
e438c9f3ab * Fix bug # 28182. 2022-09-29 09:17:45 +00:00
wangyuting2
3a6bca52e8 * Fix bug #27928. 2022-09-29 08:21:43 +00:00
wangyuting2
53cf43823d * Fix bug #28193. 2022-09-29 07:56:40 +00:00
daitingting
4eb2fcc4c7 * Remove useless codes.
* Add note for param.
2022-09-28 09:08:14 +00:00
daitingting
dc8b4f4ccd * Optimize codes. 2022-09-27 05:19:40 +00:00
daitingting
799ec7aeeb * Finish task 70572. 2022-09-27 03:19:27 +00:00
daitingting
f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong
0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
hufangzhou
952f0395c9 * Add the new version 2022-09-23 16:33:40 +08:00
wangyuting2
75771bafd2 * Fix bug #27656. 2022-09-21 05:50:44 +00:00