Commit Graph
3308 Commits
Author SHA1 Message Date
tianshujie 8e5f019f46 * Finish task #70015. 2022-09-28 11:24:47 +08:00
tianshujie c5c299b727 * Finish task #70015. 2022-09-28 09:22:13 +08:00
tianshujie 129c7dfd03 * Finish task #70015. 2022-09-28 09:15:16 +08:00
tianshujie 78905f7e05 * Finish task #70015. 2022-09-27 16:23:02 +08:00
tianshujie 37ce477c0e * Finish task #70015. 2022-09-26 14:49:20 +08:00
tianshujie 0e0d13b0a0 * Finish task #70015. 2022-09-26 10:52:36 +08:00
tianshujie 259abfd8b7 Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70015 2022-09-26 10:48:15 +08:00
孙广明 94e18345cb Merge branch 'feedback_lyk_953' into 'master'
* Fix export excel bugs.

See merge request easycorp/zentaopms!5480
2022-09-23 05:09:48 +00:00
王怡栋 4d635243bc Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5509
2022-09-23 03:16:41 +00:00
tianshujie 8bfb9344fb * Fix bug #27561. 2022-09-23 11:14:09 +08:00
wangzemei 20ccc81a8a * fix bug 27863 2022-09-23 10:52:47 +08:00
tianshujie b8206c973d * Finish task #70008. 2022-09-23 10:32:19 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
王怡栋 d2ae5b0e55 Merge branch 'sprint/wangzemei/27809' into 'master'
* fix bug 27809

See merge request easycorp/zentaopms!5492
2022-09-23 02:01:14 +00:00
wangzemei aa3c858053 * fix bug 27814 about reviewedBy width 2022-09-22 17:35:43 +08:00
wangzemei 2e6404d821 * fix assignedToAB 2022-09-22 17:27:31 +08:00
wangzemei a1356bb29a * fix bug 27809 2022-09-22 17:24:58 +08:00
liuyongkai 5795f3a7f9 * Fix export excel bugs. 2022-09-22 06:21:47 +00:00
wangzemei b77ad0dff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933 2022-09-22 13:50:12 +08:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
tianshujie a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
tianshujie 26a21964f8 * Finish task #70015. 2022-09-21 15:02:17 +08:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
mayue f206391ee6 * Fix bug #27535. 2022-09-19 13:54:34 +08:00
王怡栋 fea946a6d0 Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.

See merge request easycorp/zentaopms!5384
2022-09-19 05:37:47 +00:00
liuhong c3a1bedeef *Fix bug #27291. 2022-09-19 00:27:43 +00:00
xieqiyu 104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
liuhong 3c27ea607f *Fix bug #27291 for show duplicate requirements. 2022-09-18 13:21:03 +00:00
wangzemei a022039be1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933 2022-09-16 05:44:42 +00:00
wangzemei 4d9d562128 * merge master 2022-09-16 05:32:16 +00:00
wangzemei d43547072d * Fix bug 27511 2022-09-16 03:21:57 +00:00
wangzemei ea779aab36 * modify count 2022-09-15 09:07:39 +00:00
wangzemei eed29fef1f * modify judge 2022-09-15 09:02:32 +00:00
wangzemei ea750ec99e * add dividing judge 2022-09-15 08:32:48 +00:00
wangzemei 13c738817b * add dividing judge 2022-09-15 07:01:59 +00:00
wangzemei cfe34d7760 * add judge 2022-09-15 06:45:02 +00:00
wangzemei f25ff4605b * Finish #68935 2022-09-15 06:10:54 +00:00
wangzemei 57d8bc7cfd * modify about task #68933 2022-09-14 08:46:13 +00:00
wangzemei 95e6b99345 * task #68933 2022-09-14 06:44:17 +00:00
xieqiyu f7883bf7b7 * Fix bug#26350. 2022-09-09 15:08:06 +08:00
xieqiyu 40bc0e7966 * Fix bug#26942. 2022-09-09 11:17:37 +08:00
xieqiyu b82ca41f3d * Fix bug#27298. 2022-09-08 15:24:20 +08:00
xieqiyu 334ecb7983 * Fix bug. 2022-09-07 14:41:48 +08:00
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
liumengyi 72591c381e * Fix bug #27186. 2022-09-07 09:20:35 +08:00
王怡栋 c7024eee3c Merge branch 'master_xieqiyu_27006' into 'master'
* Fix bug#27006.

See merge request easycorp/zentaopms!5275
2022-09-06 07:56:04 +00:00
xieqiyu 4275f13884 * Fix bug#27006. 2022-09-06 15:37:55 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
王怡栋 a1e31e99e3 Merge branch 'master_xieqiyu_66957' into 'master'
* Code for task#68109.

See merge request easycorp/zentaopms!5266
2022-09-06 02:57:03 +00:00