Commit Graph

911 Commits

Author SHA1 Message Date
hufangzhou
0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
wangyidong
42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
liuruogu
e461c66fc0 * Fix bug #27604. 2022-09-20 07:30:32 +00:00
liugang
24968b1f19 * Optimize. 2022-09-19 14:45:54 +08:00
wangyidong
ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
刘刚
2c85588d1a Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Finish task #69017.

See merge request easycorp/zentaopms!5387
2022-09-19 02:02:08 +00:00
tanghucheng
30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
liuruogu
cfc214c776 * Finish task #69017. 2022-09-16 07:42:20 +00:00
tanghucheng
14dd9807e9 * Finish task #69006. 2022-09-16 13:13:26 +08:00
孙广明
ac994fc477 Merge branch 'zentaopms_239' into 'sgm_69027'
# Conflicts:
#   db/update17.6.1.sql
2022-09-16 00:46:21 +00:00
liuruogu
8d46cc5019 * Do task #69018. 2022-09-15 02:01:00 +00:00
sunguangming
c1300115e7 * Code for task #69026/69027. 2022-09-15 09:29:17 +08:00
caoyanyi
d764b13971 * Modify api param and app error. 2022-08-25 10:08:36 +08:00
李玉春
3e487df2b3 Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.

See merge request easycorp/zentaopms!5067
2022-08-23 08:26:36 +00:00
liumengyi
c95ecbd1a6 * Optimize code for task #65808. 2022-08-23 16:19:20 +08:00
liumengyi
545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
liumengyi
617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
xieqiyu
99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
曾刚
3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
王怡栋
fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
tianshujie
2e8cc2c19f * Restore code. 2022-08-15 19:37:05 +08:00
tianshujie
72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
xieqiyu
17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +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
liumengyi
845b829aaa * Fix bug #26246. 2022-08-11 10:08:06 +08:00
tianshujie
1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
王怡栋
ff55e9ca2e Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...

See merge request easycorp/zentaopms!4854
2022-08-09 05:33:04 +00:00
xieqiyu
8a159ba714 * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. 2022-08-09 09:39:58 +08:00
liumengyi
20a208f1f6 * Finish task #63691. 2022-08-08 13:43:16 +08:00
王怡栋
a1518aaf67 Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973

See merge request easycorp/zentaopms!4823
2022-08-05 06:45:43 +00:00
liuhong
3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
tianshujie
f4147a73a1 * Resolve issue #708. 2022-08-05 10:24:12 +08:00
李玉春
ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
liumengyi
2c108bcf16 * Fix bug #25987. 2022-08-03 14:06:17 +08:00
tianshujie
167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
liumengyi
6d019f65e5 * Fix bug for task #62935. 2022-08-03 08:39:25 +08:00
liumengyi
5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
liumengyi
757a39e21b * Fix issue #696. 2022-07-27 13:06:34 +08:00
liumengyi
30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
王怡栋
649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
zhouxudong
b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
孙广明
867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
liumengyi
a0a9d5e765 * Optimize for task #61971. 2022-07-26 12:02:28 +08:00
liumengyi
e3d090d917 * Fix bug for task #61975. 2022-07-26 11:18:34 +08:00
liumengyi
b67950c1ba * Fix bug for task #61973. 2022-07-26 10:27:08 +08:00
liumengyi
865986c216 * Finish task #61973. 2022-07-26 09:36:30 +08:00
liumengyi
13991e6250 * Optimize code. 2022-07-25 13:44:04 +08:00
liumengyi
c12d5d1da6 * Finish task #61975. 2022-07-25 13:38:49 +08:00
liumengyi
ba16cfa637 * Fix bug #61971. 2022-07-25 13:15:28 +08:00
孙广明
49517aec09 * Modify execution-all default param. 2022-07-21 13:13:43 +08:00