Commit Graph
565 Commits
Author SHA1 Message Date
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
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +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
王怡栋 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
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
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
孙广明 91199908ce * Code for task #56547. 2022-06-09 08:57:56 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
hufangzhou 44f99c26a5 * Modify the xuan upgrade sql. 2022-05-31 15:18:57 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
李玉春 b5ad70bcb7 Merge branch 'master' into 'sgm_sprint195'
# Conflicts:
#   db/update17.0.beta1.sql
2022-05-24 06:58:00 +00:00
孙广明 fb61022d2c * Add sql for issue. 2022-05-24 14:56:53 +08:00
liumengyi 8ff63b2215 * Fix bug for task #55255. 2022-05-24 13:15:07 +08:00
孙广明 11310cee33 * Add approval sql. 2022-05-18 15:07:08 +08:00
tanghucheng 0c3eb1a759 * Fix bug for sql. 2022-05-16 02:44:03 +00:00
lanzongjun 50487724dc * modify code for sql 2022-05-13 17:53:29 +08:00
wangyidong 12b811e4b4 * adjust for workflow field. 2022-05-13 14:19:54 +08:00
wangyidong 0e1859becf * code bug #22440. 2022-05-13 09:57:06 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
liyuchun 4c031465dc * Fix bug #22005. 2022-04-26 07:38:12 +00:00
田淑杰 4588b9c103 * Modify the sql statement. 2022-04-22 10:07:42 +08:00
王怡栋 65dac30fdf Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21853

See merge request easycorp/zentaopms!3049
2022-04-21 02:42:23 +00:00
Zongjun Lan 473d5a6566 * fix bug #21853 2022-04-21 10:13:39 +08:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
王怡栋 6fdd522363 * fix for sql. 2022-04-19 16:11:26 +08:00
王怡栋 657a8f50ef * fix bug for sql. 2022-04-19 15:12:31 +08:00
tanghucheng 9761644a92 * Fix bug #17634. 2022-04-15 14:41:18 +08:00
王怡栋 c662476270 * add index for zt_stakeholder table. 2022-04-14 10:01:46 +08:00
Zongjun Lan 486295dcc1 * fix bug *20169 2022-04-13 10:28:29 +08:00
Wenrui LI 54d333d800 * change zt_file.title to varchar. 2022-04-08 13:07:28 +08:00
tianshujie f4fd8bbf37 * Fix bug #21159. 2022-04-07 14:13:24 +08:00
tanghucheng b352dc9a86 * Fix bug. 2022-04-02 15:17:17 +08:00