Commit Graph
1626 Commits
Author SHA1 Message Date
liugang dbc8fd2c7c * Add zt_dataview when install. 2022-12-23 14:41:23 +08:00
liugang d04fc1fe4a * Move the screen module to open source. 2022-12-23 14:39:01 +08:00
qixinzhi 786b8da824 * Add chart sql and fields. 2022-12-07 16:37:42 +08:00
liugang b688d08312 Merge branch 'master' into sprint/biz17 2022-11-23 10:10:30 +08:00
liumengyi 9051379f01 * Fix bug #28580. 2022-11-22 13:45:19 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
hufangzhou 16df34b4ae * Adjust the standard sql. 2022-11-21 00:40:29 +00:00
王怡栋 8aeb743c8f Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6255
2022-11-18 06:42:59 +00:00
王怡栋 db540eb67a * code for task #76438. 2022-11-18 10:53:30 +08:00
王怡栋 787128c30e Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6235
2022-11-18 02:10:53 +00:00
caoyanyi 7d80105cff * Code for bug #29355. 2022-11-17 16:00:46 +08:00
hufangzhou a344340f1c * Remove the unwanted xuan sql. 2022-11-17 06:11:54 +00:00
hufangzhou 3dae19302b * Add the new version. 2022-11-16 06:34:29 +00:00
liumengyi dff6c3e338 * Finish task #76161. 2022-11-16 09:42:56 +08:00
liugang 7160458892 * Modify the dataview table. 2022-11-15 09:52:32 +08:00
liugang 66a85dc546 * Add the dataview table. 2022-11-14 15:26:38 +08:00
王怡栋 e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
宋辰轩 7594ccbfc1 * Delete sql and update function. 2022-11-14 13:59:31 +08:00
宋辰轩 73fa627214 * Delete unused sql. 2022-11-11 17:10:54 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
宋辰轩 901a423674 *Add sql. 2022-11-10 13:51:35 +08:00
daitingting 6868b09d1a * Fix bug. 2022-11-10 02:20:59 +00:00
daitingting 8125b5bf8b * Finish task #75240. 2022-11-09 06:13:07 +00:00
宋辰轩 83854baa14 *Remove unused sql. 2022-11-09 10:13:23 +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
宋辰轩 cb56e049e6 * Modify sql for 18-7. 2022-11-08 10:50:17 +08:00
liumengyi e4d32ca254 * Finish task #75528. 2022-11-08 10:38:05 +08:00
wangyidong d7eee8faf8 * rename update18.0.sql to update17.8.sql. 2022-11-08 09:24:25 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +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
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
caoyanyi 43ca7832f9 * Fix bug #29355. 2022-11-07 13:16:57 +08:00
wangyidong 0174edafa2 * code for task #74861. 2022-11-04 09:06:33 +08:00
liumengyi ddae3dce44 * Fix bug. 2022-11-03 11:17:29 +08:00
孙广明 82b5a43150 Merge branch 'sprint/254_tianshujie_kanban' into 'master'
* Refactor.

See merge request easycorp/zentaopms!5998
2022-11-03 00:37:46 +00:00
tianshujie af0be6c87a * Merge. 2022-11-02 16:28:26 +08:00
tianshujie 27d340e1db * Refactor. 2022-11-02 15:55:42 +08:00
孙广明 acf5a57b8f Merge branch 'sprint/254_tianshujie_kanban' into 'master'
Sprint/254 tianshujie kanban

See merge request easycorp/zentaopms!5991
2022-11-02 07:53:05 +00:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
hufangzhou d09093f42b * Add the new version. 2022-11-02 06:24:20 +00:00
liumengyi f7af6deaa6 * Optimize code after code review. 2022-11-02 13:27:31 +08:00
wangyidong 4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
liumengyi c5e5fdceb9 Merge branch 'sprint/biz17_liumengyi_74322' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17_liumengyi_74322 2022-11-01 16:25:03 +08:00
liumengyi 92054f16ec * Fix bug for task #74322. 2022-11-01 16:24:06 +08:00
wangyidong 97dcdfb72b * fix bug #29130. 2022-11-01 15:40:06 +08:00