Commit Graph
29657 Commits
Author SHA1 Message Date
李玉春 bb528a46fc Merge branch 'sprint/pailei2_tianshujie_19312' into 'pailei2'
* Fix bug #19312.

See merge request easycorp/zentaopms!2288
2022-03-16 01:28:24 +00:00
tianshujie a18c511ab0 * Fix bug #19312. 2022-03-16 09:25:11 +08:00
李玉春 ac86303fdc Merge branch 'pailei2_mayue_bug#18395' into 'pailei2'
* Fix bug#18395

See merge request easycorp/zentaopms!2287
2022-03-16 01:14:09 +00:00
孙广明 02b73ecbc3 Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'
* Finish task #50722.

See merge request easycorp/zentaopms!2285
2022-03-16 00:47:44 +00:00
李玉春 46222a0d13 Merge branch 'sprint/pailei2_zhouxudong23_50762' into 'pailei2'
Sprint/pailei2 zhouxudong23 50762

See merge request easycorp/zentaopms!2282
2022-03-16 00:46:23 +00:00
mayue 24320d7dc3 * Optimize code. 2022-03-16 08:30:41 +08:00
zhouxudong f71c269ed2 * Finish task #50762 #50763. 2022-03-16 08:30:37 +08:00
孙广明 732b928b0b Merge branch 'sprint/pailei2_tianshujie_19321' into 'pailei2'
Sprint/pailei2 tianshujie 19321

See merge request easycorp/zentaopms!2278
2022-03-15 09:10:15 +00:00
tianshujie a9fe233f4d * Fix bug #19321. 2022-03-15 17:05:45 +08:00
tianshujie 63f53d23d6 * Fix bug #19321. 2022-03-15 17:04:56 +08:00
王怡栋 fd54aab208 Merge branch 'sprint/pailei2_tianshujie_19312' into 'pailei2'
* Fix bug #19312.

See merge request easycorp/zentaopms!2276
2022-03-15 08:41:47 +00:00
mayue 38d281825c * Fix bug #18395. 2022-03-15 16:41:04 +08:00
tianshujie a9df580dec * Fix bug #19243. 2022-03-15 16:22:25 +08:00
tianshujie 3b6637b9db * Fix bug #19243. 2022-03-15 16:18:46 +08:00
zhouxudong 1847194fe7 * Finish task #50762. 2022-03-15 16:12:37 +08:00
tianshujie 02ef32158f * Fix bug #19243. 2022-03-15 15:28:27 +08:00
李玉春 a83b41d23a Merge branch 'sprint/pailei2_zhouxudong_50722' into 'pailei2'
* Finish task #50722.

See merge request easycorp/zentaopms!2270
2022-03-15 06:57:11 +00:00
zhouxudong 10ee35c7a4 * Finish task #50722. 2022-03-15 14:55:35 +08:00
tianshujie 985007b1ce * Fix bug #19321. 2022-03-15 14:52:07 +08:00
tianshujie 6a7671fb9a * Fix bug #19312. 2022-03-15 14:32:44 +08:00
zhouxudong 3c2021681b * Finish task #50722. 2022-03-15 14:31:10 +08:00
孙广明 1f6c6363ba Merge branch 'pailei2_sj_50765' into 'pailei2'
fixbug #19324

See merge request easycorp/zentaopms!2268
2022-03-15 06:02:50 +00:00
李玉春 59ff30de9d Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2265
2022-03-15 05:43:03 +00:00
孙华伟 dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08: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
李玉春 93d656dc0b Merge branch 'sprint/pailei2_zhouxudong_19967' into 'pailei2'
Sprint/pailei2 zhouxudong 19967

See merge request easycorp/zentaopms!2247
2022-03-15 05:28:44 +00:00
sunjun 316b989ffc fixbug #19324 2022-03-15 13:24:06 +08:00
孙华伟 a2d2db7b27 *Fix bug#17639 2022-03-15 13:21:14 +08:00
tianshujie 2891ecc0ae * Fix bug #20781. 2022-03-15 11:29:51 +08:00
zhouxudong 2cef18b917 * Finish task #50762 #50763. 2022-03-15 10:26:27 +08:00
zhouxin 2c347bccb8 Fix bug #20749. 2022-03-15 02:14:16 +00:00
孙华伟 ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
zhouxudong ccf68c2368 * Finish task #50722.* Finish task #50722.* Finish task #50722.* Finish task #50722.* Finish task #50722.* Finish task #50722.* Finish task #50722.* Finish task #50722. 2022-03-15 08:28:53 +08:00
孙广明 9ca7923916 Merge branch 'pailei2_zhouxin_50721' into 'pailei2'
Fix bug #19818.

See merge request easycorp/zentaopms!2249
2022-03-14 09:22:58 +00:00
zhouxudong fa85f99e59 * Fix bug #19967. 2022-03-14 17:05:18 +08:00
孙广明 b9da3ebaa4 Merge branch 'pailei2_xieqiyu_50413' into 'pailei2'
* Fix bug#17363.

See merge request easycorp/zentaopms!2242
2022-03-14 09:04:45 +00:00
zhouxin bfa1f3940d Fix bug #19818. 2022-03-14 08:40:16 +00:00
zhouxudong 2e4bb9c6ba * Fix bug #19967. 2022-03-14 16:37:13 +08:00
xieqiyu 96fc77e620 * Fix bug#17363. 2022-03-14 16:36:30 +08:00
李玉春 2ec1dd38b4 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639

See merge request easycorp/zentaopms!2237
2022-03-14 08:28:27 +00:00
孙华伟 951a3ab1af *Fix bug#17639 2022-03-14 16:26:45 +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
李玉春 f289ca23d6 Merge branch 'pailei2_sunhuawei_50428' into 'pailei2'
Pailei2 sunhuawei 50428

See merge request easycorp/zentaopms!2228
2022-03-14 08:15:16 +00:00
孙广明 ff3d2c46e2 Merge branch 'sprint/pailei2_tianshujie_50402' into 'pailei2'
Sprint/pailei2 tianshujie 50402

See merge request easycorp/zentaopms!2239
2022-03-14 08:12:46 +00:00
孙华伟 ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
tianshujie 920f64f572 * Modify the api error report. 2022-03-14 15:57:02 +08:00
孙华伟 60e271f10a *fix bug#17639 2022-03-14 15:31:29 +08:00
zhouxudong a6460758e6 * Finish task #50722. 2022-03-14 15:19:12 +08:00
孙广明 acadf9cdce Merge branch 'pailei2_zhouxin_50416' into 'pailei2'
Pailei2 zhouxin 50416

See merge request easycorp/zentaopms!2225
2022-03-14 06:22:18 +00:00
孙广明 d514977996 Merge branch 'pailei2_zhouxin_50409' into 'pailei2'
Fix bug #50409.

See merge request easycorp/zentaopms!2229
2022-03-14 06:21:00 +00:00