Commit Graph
44553 Commits
Author SHA1 Message Date
孙广明 e00aeb88e6 Merge branch 'sprint/max44_mayue_task#66987' into 'master'
* Finish task #66987.

See merge request easycorp/zentaopms!5239
2022-09-01 05:40:54 +00:00
mayue 66eec9f4db * Finish task #66987. 2022-09-01 13:39:16 +08:00
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +08:00
王怡栋 5bb9d5ea6d Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
fix code

See merge request easycorp/zentaopms!5237
2022-09-01 05:21:12 +00:00
lanzongjun 9a3fd86d66 fix code 2022-09-01 13:20:11 +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
王怡栋 5dc1b86b71 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add dy reviewissue

See merge request easycorp/zentaopms!5229
2022-09-01 02:47:52 +00:00
王怡栋 2e983841c1 Merge branch 'sprint/235_liumengyi_27136' into 'master'
* Fix bug #27136.

See merge request easycorp/zentaopms!5228
2022-09-01 02:37:12 +00:00
lanzongjun 4767bcd66f add dy reviewissue 2022-09-01 10:31:49 +08:00
liumengyi 1204e876c3 * Fix bug #27136. 2022-09-01 10:24:46 +08:00
wangyidong 81197fe961 * fix bug #26744 2022-09-01 10:20:53 +08:00
wangyidong 760c73bffa * fix bug #27001. 2022-09-01 10:20:18 +08:00
王怡栋 c9c0ceed8f Merge branch 'sprint/235_liumengyi_bug' into 'master'
* Optimize code for task #27034.

See merge request easycorp/zentaopms!5227
2022-09-01 02:18:24 +00:00
王怡栋 002753d095 Merge branch 'sprint/hufangzhou_26457' into 'master'
* Fix bug #26457.

See merge request easycorp/zentaopms!5226
2022-09-01 02:17:21 +00: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
王怡栋 2a9cc93fe1 Merge branch 'sprint/hufangzhou_25898' into 'master'
* Fix bug #25898.

See merge request easycorp/zentaopms!5218
2022-09-01 02:13:49 +00:00
liumengyi f04b74bbfc * Optimize code for task #27034. 2022-09-01 10:04:16 +08: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
hufangzhou a83076d330 * Fix bug #26457. 2022-09-01 09:47:13 +08: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
李玉春 35b891f4ed Merge branch 'sprint/235_liumengyi_bug' into 'master'
* Finish task #66996.

See merge request easycorp/zentaopms!5223
2022-09-01 01:29:40 +00:00
liumengyi 0b0627ef7a * Finish task #66996. 2022-09-01 09:15:52 +08:00
liumengyi 5f99224063 * Finish task #66996. 2022-09-01 09:14:25 +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
李玉春 1c4d7dc5e5 Merge branch 'sprint/235_tianshujie_bug' into 'master'
* Finish task #66996.

See merge request easycorp/zentaopms!5222
2022-09-01 01:06:43 +00:00
tianshujie c9c090e511 * Finish task #66996. 2022-09-01 09:04:41 +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
孙广明 27d28d2027 Merge branch 'sprint/235_tianshujie_66996' into 'master'
* Finish task #66996.

See merge request easycorp/zentaopms!5220
2022-09-01 00:38:34 +00:00
孙广明 c484efc345 Merge branch 'sprint/max44_mayue_bug#27112' into 'master'
* Fix bug #27112.

See merge request easycorp/zentaopms!5217
2022-09-01 00:35:14 +00:00
tianshujie 83802fc922 * Finish task #66996. 2022-09-01 08:28:40 +08:00
xieqiyu 2bbb4df770 * Code for task#66954. 2022-08-31 20:29:26 +08:00
xieqiyu 0d321210c5 * Code for task#66954. 2022-08-31 20:05:42 +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
mayue c1c4a8349b * Optimize code. 2022-08-31 17:10:08 +08:00
hufangzhou aa7fec1a32 * Fix bug #25898. 2022-08-31 17:08:38 +08:00