Commit Graph

19 Commits

Author SHA1 Message Date
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
liugang
3c157f01c4 * Update the builtin screens. 2022-12-28 17:48:55 +08:00
liugang
9c46441f98 * Update the builtin charts and screens. 2022-12-28 16:03:30 +08:00
liuhong
36d1fdef10 * Fix bug. 2022-12-27 08:01:51 +00:00
liugang
115877723a * Update the builtin charts and screens. 2022-12-27 15:39:35 +08:00
孙广明
bfc802bc42 * Code for task #81185. 2022-12-27 13:31:54 +08:00
孙广明
7af9dc0d83 * Merge code. 2022-12-27 13:22:35 +08:00
liuhong
c018475249 * Fix bug for sql. 2022-12-27 02:24:17 +00:00
hufangzhou
3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang
1401333297 * Update the builtin charts and screens. 2022-12-27 08:37:59 +08:00
liugang
d66a961b00 * Update sql. 2022-12-26 16:38:51 +08:00
liugang
5c2da929f6 * Add the builtin field. 2022-12-26 15:53:39 +08:00
liugang
0d4f0f34ab * Rename update sql. 2022-12-26 08:54:02 +08:00
孙广明
3e9aee30f5 Merge branch 'sprint_bug' into 'zentaopms_277'
* Fix bug #31141 #31140.

See merge request easycorp/zentaopms!6620
2022-12-23 02:24:19 +00:00
liuhong
469bd86d34 * Fix bug #31141 #31140. 2022-12-22 07:58:47 +00:00
孙广明
32fbcfaabf * Fix bug #31129. 2022-12-22 15:22:11 +08:00
liuhong
fca70f5855 * Code for task #80849. 2022-12-22 01:33:04 +00:00
liuhong
f1baa412b1 * Finish task #80489. 2022-12-22 00:51:38 +00:00
孙广明
b3e194065b * Add upgrade sql. 2022-12-21 10:59:05 +08:00