Commit Graph
9 Commits
Author SHA1 Message Date
王怡栋 e8654f20a9 Merge branch 'master' into 'sprint/zentaomax42'
# Conflicts:
#   db/update17.5.sql
2022-08-19 02:34:50 +00:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
王怡栋 c7824fef1a Merge branch 'sprint/zentaomax42' into 'max42_tanghucheng'
# Conflicts:
#   db/update17.5.sql
2022-08-18 02:45:56 +00:00
tianshujie 9cd4212ef7 i* Finish task #63696. 2022-08-18 10:23:41 +08:00
tianshujie 0ea6aa7b27 * Finish task #63696. 2022-08-18 10:04:09 +08:00
tanghucheng 556bdd9cbc * Add feedback repeatFeedback field. 2022-08-18 09:34:45 +08:00
lanzongjun c28e0748dd * finish task #64943 2022-08-17 16:39:55 +08:00
tianshujie 64c7f8dc23 * Finish task #63687. 2022-08-17 13:15:35 +08:00
tianshujie 4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08:00