Commit Graph
65 Commits
Author SHA1 Message Date
朱金勇 681ef77189 * Fix bug#34207. 2023-04-17 05:59:03 +00:00
朱金勇 049cf321f6 * Fix bug#34211. 2023-04-17 05:44:18 +00:00
朱金勇 4ff5f28cfa * Fix bug#34226. 2023-04-17 05:05:05 +00:00
朱金勇 d03698d3a2 * Fix bug#34235. 2023-04-17 04:39:08 +00:00
liugang f8db8566c7 * Process exist privileges of bi. 2023-04-17 03:31:12 +00:00
朱金勇 7ad02685c2 * Fix bug#34105. 2023-04-17 03:12:13 +00:00
朱金勇 b15c877da7 * Fix bug#34223. 2023-04-17 02:51:17 +00:00
朱金勇 bf65000aff * Fix bug#34232. 2023-04-16 14:09:36 +00:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 e074e17dc8 * Fix bugs of dmdb. 2023-04-16 11:53:19 +00:00
朱金勇 9e4ba356c6 * Fix install for dmdb. 2023-04-14 05:48:49 +00:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
wangyuting2 f0484ee266 * Finish task #90970. 2023-04-14 09:18:48 +08:00
liugang 566a3e69f9 * Sort sqls to upgrade privileges. 2023-04-14 01:05:30 +00:00
liugang 99acc957a6 * Remove collate property. 2023-04-14 01:04:22 +00:00
朱金勇 267035c94c * Fix install for dmdb. 2023-04-13 17:24:29 +00:00
liugang 9132411a03 * Sort privileges when upgrade. 2023-04-13 09:49:28 +00:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
tianshujie adcaacc46d * Document processing permission. 2023-04-13 16:40:46 +08:00
朱金勇 6e3b635868 * Add default value for zt_workflowaction. 2023-04-13 07:36:12 +00:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
朱金勇 6dcf3bc19e * Add default value for workflow. 2023-04-13 05:48:38 +00:00
朱金勇 bb531cfd2c * Fix bugs in dmdb. 2023-04-13 05:10:17 +00:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
tianshujie 38b99d75ed * Code for task #89927. 2023-04-12 11:09:20 +08:00
朱金勇 884de3724c - Remove charset in sql. 2023-04-12 02:34:27 +00:00
朱金勇 738df10b4c * Fix install steps. 2023-04-12 02:03:23 +00:00
wangyuting2 d59002cc69 * Finish task #90970. 2023-04-11 17:26:48 +08:00
daitingting ee8f7b50f9 * Process filter of chart.
* Process group of report.
2023-04-11 14:59:11 +08:00
wangyidong 9bba7c624d * code for task #90783. 2023-04-11 14:44:09 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
朱金勇 6e27c59147 * Fix importing demo data. 2023-04-08 15:01:22 +00:00
caoyanyi 13a7efb50c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:22:34 +08:00
wangyidong 38898d1a13 * code for task #89914. 2023-04-07 10:53:53 +08:00
朱金勇 c5ad00e960 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-07 02:39:22 +00:00
朱金勇 13374f3230 * Fix default value of field. 2023-04-07 02:37:07 +00:00
刘刚 aa9212c821 Merge branch 'sprint/biz37_task90074' into 'master'
Add chart module.

See merge request easycorp/zentaopms!7326
2023-04-07 02:34:33 +00:00
tianshujie 2e5404f1bd * Add update SQL for api module. 2023-04-07 10:08:30 +08:00
朱金勇 4b399ad8f7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-07 01:13:42 +00:00
朱金勇 3516d6c670 - Remove registerDate in assetlib table. 2023-04-07 01:11:28 +00:00
liugang 0a096cf93a + Drop unused field. 2023-04-06 10:11:17 +00:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 0f6b78f264 Fix strict mode of MySQL. 2023-04-05 02:11:12 +00:00
daitingting b368f38d57 * Finish task #89953. 2023-04-04 13:53:25 +08:00
zhaoke 91af62ac48 Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-04 13:46:52 +08:00
liugang 5282f9407f * Sort sqls and fix bug 3 screens' status are draft. 2023-04-04 05:18:02 +00:00
朱金勇 e714c29ea7 Format schema of database. 2023-04-04 05:09:54 +00:00