Commit Graph
3011 Commits
Author SHA1 Message Date
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master'
* Code for task#66955.

See merge request easycorp/zentaopms!5245
2022-09-02 05:07:46 +00:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
xieqiyu 62e9b5aa44 * Code for task#66955. 2022-09-02 09:44:14 +08:00
wangyidong 5fe9412a2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-01 14:30:56 +08:00
wangyidong db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00
王怡栋 e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
tianshujie f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
孙广明 da43a0c083 Merge branch '230' into 'sprint/zentaopms230'
* Fix bug #27110.

See merge request easycorp/zentaopms!5235
2022-09-01 05:17:18 +00:00
sunguangming 09a0f1c420 * Fix bug #27110. 2022-09-01 13:16:38 +08:00
孙广明 7473080790 Merge branch '230' into 'sprint/zentaopms230'
* Finish taks #67403

See merge request easycorp/zentaopms!5234
2022-09-01 05:12:58 +00:00
liuyongkai 29c53164b3 * Finish task #67403. 2022-09-01 05:11:55 +00:00
wangyidong 2b237ea8e3 * fix bug for assignTo for linea task. 2022-09-01 11:23:12 +08:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
wangyidong 81197fe961 * fix bug #26744 2022-09-01 10:20:53 +08:00
王怡栋 ef84a5fb9a Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #66992

See merge request easycorp/zentaopms!5224
2022-09-01 02:16:40 +00:00
王怡栋 e4b0527659 Merge branch 'master_liuhong_66217' into 'master'
*Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619.

See merge request easycorp/zentaopms!5193
2022-09-01 01:59:33 +00:00
lanzongjun 07c97f4072 modify processed 2022-09-01 09:40:57 +08:00
liuyongkai fbd3f09a3d * Finish task 65047. 2022-09-01 01:38:38 +00:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun 11ace1e2da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-09-01 09:11:23 +08:00
liuhong 2a93c8cff5 *Fix bug #66217. 2022-09-01 01:11:22 +00:00
lanzongjun 1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00
孙广明 c97f2057ed Merge branch '230' into 'sprint/zentaopms230'
* Fix bug #27023.

See merge request easycorp/zentaopms!5221
2022-09-01 00:42:23 +00:00
liuyongkai 161f19e15a * Finish task #67403. 2022-09-01 00:40:48 +00:00
sunguangming ed3dec4d5f * Fix bug #27023. 2022-09-01 08:40:23 +08:00
liuhong 4aff831a07 *Fix bug #66217. 2022-08-31 11:20:09 +00:00
xieqiyu e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
xieqiyu b026b7c494 * Code for task#66955. 2022-08-31 18:27:42 +08:00
wangyidong 0095192c32 * fix bug for record estimate. 2022-08-31 16:49:21 +08:00
wangyidong 39ce15c672 * fix bug #27092. 2022-08-31 16:11:54 +08:00
wangyidong 1471e7fbb9 * fix bug #27011. 2022-08-31 15:38:22 +08:00
liuhong 83639aaa07 *Fix bug 66217 2022-08-31 06:58:11 +00:00
liuhong b0c1f7c868 *Fix bug #66217. 2022-08-31 06:16:09 +00:00
liuhong 18d6ed7f2d *Fix bug #66217. 2022-08-31 06:13:31 +00:00
sunguangming 5463a7e62c * merge code. 2022-08-31 14:06:04 +08:00
wangyidong cfec41de06 * fix bug #27014. 2022-08-31 11:25:24 +08:00
wangyidong 49700f4923 * fix bug #27016. 2022-08-31 11:20:31 +08:00
wangyidong 4f478a3ec8 * fix bug #27065. 2022-08-31 10:30:42 +08:00
wangyidong 82fa2a5ddb * fix bug #27067. 2022-08-31 10:18:27 +08:00
liuhong 3dfd3ecfca *Finish task #66217,66218,66210 Fix bug 26687,26632,26622,26619. 2022-08-30 04:08:38 +00:00
tianshujie cf56fd3c55 * Fix bug #26758. 2022-08-29 11:12:50 +08:00
孙广明 8c278d9f59 * Code for multi task. 2022-08-29 10:38:22 +08:00
wangyidong 5f4f284a2b * add for unit test. 2022-08-29 09:07:54 +08:00