Commit Graph
35112 Commits
Author SHA1 Message Date
zhouxin 34696a7372 Fix bug #17224. 2022-03-16 08:05:15 +00:00
孙广明 11bc8282aa Merge branch 'sprint/pailei2_tianshujie_19289' into 'pailei2'
Sprint/pailei2 tianshujie 19289

See merge request easycorp/zentaopms!2300
2022-03-16 06:59:44 +00:00
孙广明 8472794851 Merge branch 'sprint/pailei2_tianshujie_18760' into 'pailei2'
Sprint/pailei2 tianshujie 18760

See merge request easycorp/zentaopms!2308
2022-03-16 06:58:40 +00:00
李玉春 dd8637a28b Merge branch 'pailei2_mayue_bug#17216' into 'pailei2'
* Fix bug #17216.

See merge request easycorp/zentaopms!2307
2022-03-16 06:57:09 +00:00
tianshujie ccc2b37ee9 * Fix kanban column display problem. 2022-03-16 14:56:14 +08:00
孙广明 52193bd9ee Merge branch 'pailei_sunjun_50784' into 'pailei2'
fixbug #18669

See merge request easycorp/zentaopms!2304
2022-03-16 06:32:04 +00:00
sunjun ef285a4869 fixbug #18669 2022-03-16 14:27:49 +08:00
tianshujie e2af5a521e * Fix bug #18760. 2022-03-16 14:08:44 +08:00
孙广明 e2eb8999e5 Merge branch 'pailei2_zhouxin_50789' into 'pailei2'
Pailei2 zhouxin 50789

See merge request easycorp/zentaopms!2294
2022-03-16 05:28:51 +00:00
孙广明 6058067301 Merge branch 'pailei2_zhouxin_50791' into 'pailei2'
Fix bug #18301.

See merge request easycorp/zentaopms!2295
2022-03-16 05:27:57 +00:00
mayue 122ffd9c2c * Fix bug #17216. 2022-03-16 13:23:58 +08:00
孙广明 4cc13f3b13 Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Revert code.

See merge request easycorp/zentaopms!2296
2022-03-16 05:10:42 +00:00
mayue bff6607776 * Revert code. 2022-03-16 13:05:31 +08:00
王怡栋 74280e35c8 Merge branch 'sprint/pailei2_tianshujie_19314' into 'pailei2'
Sprint/pailei2 tianshujie 19314

See merge request easycorp/zentaopms!2293
2022-03-16 05:04:59 +00: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
tianshujie 74548de746 * Fix the problem of no Kanban after Kanban execution creation. 2022-03-16 12:54:13 +08:00
tianshujie b213f38e1f * Fix bug #17944. 2022-03-16 12:09:51 +08:00
tianshujie bc03600b03 * Fix bug #19289. 2022-03-16 10:50:08 +08:00
tianshujie 260a42de02 * Fixed an issue where the console reported an error when editing bugs. 2022-03-16 09:55:29 +08:00
tianshujie c0d4c5fa8c * Fix bug #19314,19298. 2022-03-16 09:43:58 +08:00
zhouxin f6a7577749 Fix bug #18306. 2022-03-16 01:39:05 +00:00
李玉春 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
zhouxin b52e26ce89 Fix bug #18301. 2022-03-16 00:39:08 +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
李玉春 e700b4414a Merge branch 'pailei2_mayue_bug#17576' into 'pailei2'
* Fix bug #17576.

See merge request easycorp/zentaopms!2279
2022-03-15 09:15:40 +00: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
zhouxin 1140f79663 Fix bug #18306. 2022-03-15 09:07:58 +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
孙广明 520148796d Merge branch 'pailei2_xieqiyu_50430' into 'pailei2'
* Fix bug#20111.

See merge request easycorp/zentaopms!2261
2022-03-15 07:48:25 +00: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
mayue 405e26a93d * Fix bug #17576. 2022-03-15 13:39:16 +08:00
孙华伟 dd727476ad * Fix bug #17639. 2022-03-15 13:36:52 +08:00