Commit Graph
1417 Commits
Author SHA1 Message Date
caoyanyi 364cf79920 * Add sql. 2022-07-19 08:35:02 +08:00
caoyanyi 9037038690 * Modify data name. 2022-07-18 10:36:26 +08:00
lanzongjun 32eef59eaf * add standard sql 2022-07-14 09:05:46 +08:00
lanzongjun eac15cf70a * fix bug #25172 2022-07-13 16:04:15 +08:00
hufangzhou d133a2b5e8 * Add the new version. 2022-07-13 13:28:45 +08:00
lanzongjun 47aed9058f * fix task #60360 2022-07-13 10:16:07 +08:00
wangyidong 6757d64f6e * fix field type. 2022-07-11 16:16:59 +08:00
wangyidong 6d71c5e346 * fix bug #24794. 2022-07-07 13:18:25 +08:00
孙广明 6f1521407c * Add cfd cron. 2022-07-06 09:07:13 +08:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
hufangzhou 4336b35a36 * Fix bug #24626. 2022-06-30 15:13:34 +08:00
hufangzhou ab1a43e1c6 * Change the xuan version. 2022-06-30 09:10:00 +08:00
王怡栋 f1c9378e10 Merge branch 'sprint/devplat_29' into 'master'
* Add fields to integrate workflow and approval.

See merge request easycorp/zentaopms!4224
2022-06-29 09:08:21 +00:00
tanghucheng a4966c759b * Fix bug #24552. 2022-06-29 16:27:58 +08:00
liugang 21ea84f2f5 * Add fields to integrate workflow and approval. 2022-06-29 16:21:06 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
朱金勇 0766e36e20 Merge branch 'sprint/scx_api' into 'master'
* Update api.

See merge request easycorp/zentaopms!4185
2022-06-28 05:57:43 +00:00
宋辰轩 afdde557fc * Update api. 2022-06-28 13:51:10 +08:00
王怡栋 956c806cf9 Merge branch 'master' into 'sprint/208_liumengyi_58561'
# Conflicts:
#   db/update17.1.sql
2022-06-28 05:08:18 +00:00
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
wangyuting2 e8dbad3b19 * Add approval field to zt_workflow. 2022-06-28 08:33:59 +08:00
tanghucheng 6226497d08 * Code for install max. 2022-06-23 16:51:30 +08:00
孙广明 33dd17eb8a Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765

See merge request easycorp/zentaopms!4094
2022-06-23 05:30:16 +00:00
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
#   db/update17.1.sql
2022-06-23 05:00:48 +00:00
孙广明 65a162536a * Fix details. 2022-06-23 11:27:55 +08:00
王怡栋 e6f8af9c13 Merge branch 'master' into 'sgm_kanbanwip'
# Conflicts:
#   db/update17.1.sql
2022-06-23 03:23:53 +00:00
孙广明 d710725155 * Add set wip. 2022-06-23 10:00:48 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
孙广明 a58607bbaa * Code for task #58217. 2022-06-22 18:25:02 +08:00
mayue 6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
tianshujie a2e0cc5cb3 * Finish task #58290. 2022-06-22 16:51:28 +08:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
wangyidong f0ff649fa5 * add zentaomax sql to zentao.sql. 2022-06-22 08:33:43 +08:00
wangyidong 541f9dd0d1 * code for bug #58034. 2022-06-21 14:53:45 +08:00
tianshujie d3408b9212 * Finish task #57894. 2022-06-21 13:52:27 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
hufangzhou 64a0dab834 * Add the new version. 2022-06-16 18:04:47 +08:00
孙广明 bae7786801 * Add upgrade sql. 2022-06-16 16:47:47 +08:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
孙广明 212fb344c3 * Finish task #56545. 2022-06-10 09:44:48 +08:00
孙广明 9d477cc0cf Merge branch 'master' into 'liyuchun_56551'
# Conflicts:
#   db/update17.0.sql
2022-06-09 01:30:08 +00:00
liyuchun d4d24b6e9d * Code for task #56551. 2022-06-09 01:24:38 +00:00
孙广明 3ecf2469bf Merge branch 'master' into 'sgm_review'
# Conflicts:
#   db/update17.0.sql
2022-06-09 01:14:10 +00:00
孙广明 91199908ce * Code for task #56547. 2022-06-09 08:57:56 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
zhujinyong 9f322ef866 * Renew apis. 2022-06-06 08:53:54 +08:00
wangyidong 644a4f1a59 * rename sql. 2022-06-02 15:13:24 +08:00
wangyidong fb786e9cf6 * remove useless flow action. 2022-06-02 15:02:38 +08:00