Commit Graph
790 Commits
Author SHA1 Message Date
朱金勇 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
朱金勇 13374f3230 * Fix default value of field. 2023-04-07 02:37:07 +00: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
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
朱金勇 e714c29ea7 Format schema of database. 2023-04-04 05:09:54 +00:00
tianshujie 5ada3019fe * Fixing SQL problems. 2023-04-03 18:31:03 +08:00
tianshujie 72abd88a86 * Code for task #89927. 2023-04-03 13:51:50 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
宋辰轩 17dab4c121 * Add sql from update18-3 to zentao-sql. 2023-03-31 13:28:13 +08:00
wangyidong fd043f0b9b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-31 08:59:38 +08:00
wangyidong f2a164ffb8 Merge branch 'sprint/biz17' 2023-03-31 08:58:40 +08:00
tianshujie 74cc9c8620 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-30 16:28:43 +08:00
宋辰轩 c590e94f0c * Modify bi sql. 2023-03-29 13:01:45 +08:00
liumengyi 9842006745 * Fix bug of screen. 2023-03-29 10:32:47 +08:00
liumengyi fc9f1a510a * Fix bug of screen. 2023-03-29 10:31:15 +08:00
liumengyi 03ecfe5450 * Fix bug of screen. 2023-03-29 09:43:14 +08:00
tianshujie d01a9f8a86 * Add a document library field. 2023-03-28 09:36:50 +08:00
朱金勇 0c70fda291 * Refactor sql. 2023-03-26 15:12:48 +00:00
liumengyi 4c3e92742d * Finish task #87811. 2023-03-24 13:51:42 +08:00
liumengyi fe9b67d09d * Finish task #87810. 2023-03-24 13:35:50 +08:00
liumengyi 2fedb5d73d * Finish task #87810. 2023-03-24 13:30:32 +08:00
liumengyi fc04d3a5be * Finish task #87822, #87807. 2023-03-24 11:14:17 +08:00
liumengyi 8cb7883e7f * Finish task #87780. 2023-03-24 09:18:16 +08:00
liumengyi 498ee8547f * Finish task #87765. 2023-03-23 15:54:19 +08:00
liumengyi f729ac2b47 * Update screen scheme. 2023-03-23 15:11:15 +08:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
tianshujie 53666d1580 * Add the concept of default requirements. 2023-03-16 16:16:00 +08:00
qixinzhi b4e8de97e5 Merge branch 'master' into sprint/biz17 2023-03-06 09:04:52 +08:00
tianshujie c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
Yagami 445c93b4a9 * Remove unused sql. 2023-02-28 09:47:06 +08:00
wangyidong 71f0edcb20 * add new priv for custom-hours. 2023-02-27 16:20:06 +08:00
liumengyi a26a5c5860 * Fix sql error. 2023-02-27 06:41:48 +00:00
liumengyi f2f4b430ef * Fix bug #32433. 2023-02-27 02:32:15 +00:00
liumengyi f784951e18 * Add sql for process. 2023-02-24 02:05:50 +00:00
wangyuting2 75abf27b0d * Finish task #85197. 2023-02-23 08:51:42 +08:00
wangyuting2 d99b84dfb2 * Add sql. 2023-02-22 16:28:30 +08:00
liumengyi ff7ff98bff * Finish task #85042. 2023-02-22 01:44:23 +00:00
liumengyi ffedd1ac6d * Fix bug of sql. 2023-02-21 07:36:49 +00:00
liumengyi 95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
王怡栋 3f9c3e40e1 Merge branch 'zentaopms284_bug#31889' into 'master'
* Fix bug #31889.

See merge request easycorp/zentaopms!6846
2023-02-02 08:57:17 +00:00
hufangzhou c27e0ae9a6 * Add the mark for auto pack, and integrate the table creation statement. 2023-02-02 08:48:58 +00:00
wangyuting2 40e5f5bdde * Fix bug #31889. 2023-02-02 16:37:46 +08:00
zenggang 597b77af82 * Edit snapshot 2023-02-02 08:31:06 +00:00