Commit Graph
9 Commits
Author SHA1 Message Date
wangyidong 5c1e2c160d * adjust for flow. 2022-05-26 09:01:58 +08:00
wangyidong 2decbcc7c5 * adjust for flow. 2022-05-26 09:00:41 +08:00
wangyidong 3159eb540a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-25 16:39:53 +08:00
wangyidong ddb25449d2 * code for task #54955. 2022-05-25 16:38:38 +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 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00