Commit Graph
1809 Commits
Author SHA1 Message Date
liumengyi d2632c11fd * Fix bug #33054. 2023-03-17 03:06:40 +00:00
tianshujie 53666d1580 * Add the concept of default requirements. 2023-03-16 16:16:00 +08:00
宋辰轩 180c02755f * Remove sql to 18-2. 2023-03-15 17:07:51 +08:00
宋辰轩 1e882e4a9c * Remove sql to 18-3. 2023-03-15 17:02:16 +08:00
宋辰轩 da0fd20ff3 * Drop dimension. 2023-03-15 17:00:36 +08:00
hufangzhou 5b033e8f42 * Remove the unused table. 2023-03-15 15:53:52 +08:00
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
tianshujie e9d3886dac Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 13:03:16 +08:00
tianshujie c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
wangyidong 7f2f970bd5 * delete dev-editor priv. 2023-03-03 10:28:19 +08:00
hufangzhou e89d668fc5 * Format the code and remove type restriction when batch change execution's status. 2023-03-01 07:44:23 +00:00
tianshujie 7f121ebdf7 * Code for fix bug #32487. 2023-03-01 14:29:57 +08:00
tianshujie ffab596abf * Code for fix bug #32519. 2023-03-01 09:42:03 +08:00
tianshujie 688c38b78b * Code for fix bug #32519. 2023-03-01 09:27:20 +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 fd28232487 * Finish task #85630. 2023-02-27 08:05:14 +00:00
孙广明 167539f822 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.

See merge request easycorp/zentaopms!7076
2023-02-27 06:59:14 +00:00
hufangzhou 42769d3425 * Add the new version. 2023-02-27 06:51:34 +00: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
liumengyi 7198c095e5 * Only get system classify value. 2023-02-22 07:58:41 +00:00
liumengyi ff7ff98bff * Finish task #85042. 2023-02-22 01:44:23 +00:00
liumengyi ae8e745acd * Finish task #85042. 2023-02-22 01:42:50 +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
liumengyi 3d67146b1a * Move sql. 2023-02-20 01:48:54 +00:00
hufangzhou aaeeb9372d * Code for task #84583. 2023-02-19 09:17:49 +00:00
Yagami c4fad607e8 * Add upgrade sql. 2023-02-17 11:12:22 +08:00
tianshujie dbad8ab513 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-14 08:52:02 +08:00
hufangzhou 2335bb50a3 * Fix bug #32075. 2023-02-13 15:35:22 +08:00
hufangzhou 5da5e0070c * Move the sql to update18.0.beta3.sql. 2023-02-13 15:22:59 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
liumengyi 6f39d4f87c * Add sql. 2023-02-10 13:58:22 +08:00
hufangzhou 0d8410cdca * Change update sql. 2023-02-09 06:05:51 +00:00
liumengyi 54748bc377 * Fix bug #31992. 2023-02-09 13:59:02 +08:00
hufangzhou 025aa5dc4b * Add the new version. 2023-02-08 02:44:44 +00:00
王怡栋 fd92f0e6ae Merge branch 'zenops_61' into 'master'
Zenops 61

See merge request easycorp/zentaopms!6876
2023-02-08 01:55:38 +00:00
wangyuting2 3915c2c1d1 * Fix bug #24665. 2023-02-08 09:39:28 +08:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
hufangzhou 652595112f * Finish task #83955. 2023-02-06 08:59:34 +00:00
zhaoke ffcc487808 * Finish task #83362. 2023-02-02 09:16:09 +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
liumengyi a171190cfc * Finish task #83508. 2023-02-01 14:49:18 +08:00