Commit Graph
14 Commits
Author SHA1 Message Date
hufangzhou ab1a43e1c6 * Change the xuan version. 2022-06-30 09:10:00 +08:00
liugang 21ea84f2f5 * Add fields to integrate workflow and approval. 2022-06-29 16:21:06 +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
王怡栋 748f1ffedf Merge branch 'master' into 'sgm_prjadmin'
# Conflicts:
#   db/update17.1.sql
2022-06-23 05:00:48 +00: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
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 541f9dd0d1 * code for bug #58034. 2022-06-21 14:53:45 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00