Commit Graph
1079 Commits
Author SHA1 Message Date
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong 0a3c297b43 * Finish task #64882. 2022-08-19 02:18:16 +00:00
zhouxudong 9883b69c7d * Finish task #64882. 2022-08-18 09:21:35 +00:00
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
zhouxudong fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
lanzongjun 572021a1bd * fix params 2022-08-16 13:06:58 +08:00
lanzongjun 4b21f31e5c * fix bug #26462 2022-08-16 11:22:57 +08:00
lanzongjun 5b380fedb4 * fix bug cp project 2022-08-16 09:19:27 +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
zhouxudong 7826781cff * Fix bug. 2022-08-11 08:53:49 +00:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
xieqiyu bd18594c80 * Code for task#63579. 2022-08-10 15:09:57 +08:00
xieqiyu f8cf3855d2 * Code for task#63581. 2022-08-10 13:04:40 +08:00
zhouxudong 01c75c8370 * Finish task. 2022-08-09 15:08:33 +00:00
zhouxudong 808d01aa17 * Finish task. 2022-08-09 09:43:34 +00:00
zhouxudong 3cc9977663 * Finisha task. 2022-08-09 05:49:27 +00: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
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
zhouxudong e56f5c8082 * Update code. 2022-08-05 07:39:23 +00:00
zhouxudong 0e5fccdc46 * Update code. 2022-08-05 06:20:54 +00:00
liuhong 3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
zhouxudong 03ed6c4dfe * Update code. 2022-08-05 05:50:15 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 461e3275db * Finish task #62850. 2022-08-04 01:32:48 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
sunguangming 019bf42e4d * Fix bug #25814. 2022-07-28 13:10:11 +08:00
lanzongjun 007462353c * fix bug #25750 2022-07-28 10:21:16 +08:00
tianshujie 270618a38c * Fix bug #25733. 2022-07-27 13:29:19 +08:00
lanzongjun e6eff527d2 move code 2022-07-26 14:56:50 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
tianshujie 68da0b31d2 * Modify the return link for the delete project method. 2022-07-21 11:35:11 +08:00
tianshujie 1f00ba8c03 * Modify the return link for the delete project method. 2022-07-21 09:51:50 +08:00
lanzongjun e5c2184bab tmp 2022-07-20 18:06:34 +08:00
lanzongjun 658eedc2d5 tmp 2022-07-20 15:30:47 +08:00
lanzongjun 3c24e61b69 tmp 2022-07-19 17:24:52 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
2022-07-14 02:06:13 +00:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
王怡栋 a769590829 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4502
2022-07-13 03:29:11 +00:00
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +08:00