Commit Graph
2440 Commits
Author SHA1 Message Date
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +00:00
孙广明 df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
2022-03-31 03:06:37 +00:00
zhouxudong 8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
xieqiyu 0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
李玉春 a680dd14e7 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #6971.

See merge request easycorp/zentaopms!2638
2022-03-30 09:12:48 +00:00
liyuchun 74d2ed5ea6 * Fix bug #11348. 2022-03-30 17:01:15 +08:00
caoyanyi c2bc48fc38 * Fix bug #6971. 2022-03-30 13:29:38 +08:00
zenggang 5ceeb72655 * Finish task#51117 2022-03-30 02:43:34 +00:00
zhouxudong a42d621269 * Fix bug #18083. 2022-03-30 09:13:13 +08:00
zhouxudong e97eab6f68 * Fix bug #18083. 2022-03-30 08:50:14 +08:00
zhouxudong a7f9fdca86 * Fix bug #18083. 2022-03-29 14:03:53 +08:00
xieqiyu 01a7b6391b * Fix bug#11308,#20582. 2022-03-29 08:22:45 +08:00
李玉春 382e4493f1 Merge branch 'sprint/master_zhouxudong_11919' into 'master'
Sprint/master zhouxudong 11919

See merge request easycorp/zentaopms!2582
2022-03-28 08:12:30 +00:00
zhouxudong 5607b4f6c8 * Fix bug #11919. 2022-03-28 15:12:12 +08:00
xieqiyu f72da77a5d * Code for bug#20875. 2022-03-28 13:52:42 +08:00
zhouxudong d689db05a7 * Fix bug #11919. 2022-03-28 13:10:11 +08:00
zhouxudong 5129df89d2 * Fix bug #11919. 2022-03-28 11:11:31 +08:00
zhouxudong 0f999761c9 * Fix bug #11919. 2022-03-28 11:10:21 +08:00
zhouxudong 92648cadc8 * Fix bug #11919. 2022-03-25 15:23:15 +08:00
tianshujie c9c1573a2d * Fix bug #20523. 2022-03-24 14:40:38 +08:00
王怡栋 39c46536f1 * code for task #51327. 2022-03-23 11:05:58 +08:00
王怡栋 d71568e98d * code for task #51327. 2022-03-23 10:55:05 +08:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
zhouxudong a643044137 * Fix bug #16070. 2022-03-22 14:53:08 +08:00
王怡栋 890b8a39c6 Merge branch 'sprint/lite6_lwr_filter_deleted_lanes' into 'master'
* filter out deleted lanes, task #51311, bug #20972.

See merge request easycorp/zentaopms!2426
2022-03-22 03:14:12 +00:00
Wenrui LI 56053267c1 * fix where deleted condition of query. 2022-03-22 11:07:49 +08:00
zhujinyong 0cf390702c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:55:21 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
王怡栋 ff30f9fa2f * adjust for init story for batch create task. 2022-03-22 10:53:26 +08:00
Wenrui LI b232bd54fe * filter out deleted lanes, task #51311, bug #20972. 2022-03-22 10:39:28 +08:00
王怡栋 25b0c39dcc * fix bug #21029. 2022-03-22 10:31:47 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
caoyanyi bd8dfd8269 Merge branch 'Zentao_app1.1' of https://gitlab.zcorp.cc/easycorp/zentaopms into Zentao_app1.1 2022-03-21 14:41:49 +08:00
caoyanyi f2d6299356 * Fix bug #20662. 2022-03-21 10:39:41 +08:00
zhouxudong fb7176359b * Fix bug #11985. 2022-03-21 09:55:33 +08:00
zhouxudong a7516f1178 * Fix bug #11985. 2022-03-21 09:41:23 +08:00
王怡栋 371b7a7d7d Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2'
* Fix bug #17944.

See merge request easycorp/zentaopms!2292
2022-03-16 05:04:22 +00:00
李玉春 2872292277 Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
*Fix bug#20452

See merge request easycorp/zentaopms!2253
2022-03-15 05:34:06 +00:00
tianshujie 2891ecc0ae * Fix bug #20781. 2022-03-15 11:29:51 +08:00
Zongjun Lan 5be25315f3 * fix bug #19535 2022-03-15 11:10:30 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
孙华伟 ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
李玉春 bb05dc2ffe Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
Pailei2 sunhuawei 50714

See merge request easycorp/zentaopms!2231
2022-03-14 08:17:05 +00:00
孙华伟 ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
Zongjun Lan 3d936d7dc8 * fix bug #20703 2022-03-14 15:43:15 +08:00
孙华伟 6d3030063f * 2022-03-14 13:11:08 +08:00
zhouxin f9c4e15149 Fix bug #50416. 2022-03-14 02:09:18 +00:00
zhouxin f470e0d96b Fix bug #50416. 2022-03-11 06:58:47 +00:00
zhouxin 9f289a632a Fix bug 50416. 2022-03-11 06:45:03 +00:00
tianshujie 2e3438edfc * Modify the code. 2022-03-11 14:43:18 +08:00