Commit Graph
35140 Commits
Author SHA1 Message Date
孙广明 849646477a Merge branch 'pailei2_xieqiyu_20381' into 'pailei2'
* Fix bug#20381.

See merge request easycorp/zentaopms!2321
2022-03-17 05:49:46 +00:00
孙广明 ba9df85338 Merge branch 'pailei2_xieqiyu_18756' into 'pailei2'
* Fix bug#18756.

See merge request easycorp/zentaopms!2331
2022-03-17 05:49:10 +00:00
李玉春 8f529f185e Merge branch 'pailei2_mayue_bug#20746' into 'pailei2'
* Fix bug #20746.

See merge request easycorp/zentaopms!2318
2022-03-17 05:38:06 +00:00
xieqiyu 00a8efaf80 * Fix bug#18756. 2022-03-17 13:37:20 +08:00
李玉春 59850d5e8f Merge branch 'pailei2_sunhuawei_50728' into 'pailei2'
*Fix bug#19716

See merge request easycorp/zentaopms!2252
2022-03-17 05:36:01 +00:00
李玉春 29ee5b4226 Merge branch 'sprint/pailei2_tianshujie_18344' into 'pailei2'
* Fix bug #18344.

See merge request easycorp/zentaopms!2323
2022-03-17 03:20:09 +00:00
李玉春 6e3facd6c2 Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'
Sprint/pailei2 tianshujie fixbug

See merge request easycorp/zentaopms!2325
2022-03-17 03:15:34 +00:00
tianshujie e8d2aa6b3e * Modify variable name. 2022-03-17 11:13:04 +08:00
李玉春 329e6759b4 Merge branch 'sprint/pailei2_tianshujie_18558' into 'pailei2'
* Fix bug #18558.

See merge request easycorp/zentaopms!2326
2022-03-17 03:07:57 +00:00
tianshujie f3874a74ad * Fix bug #19074. 2022-03-17 10:59:48 +08:00
tianshujie 5c90c8677d * Fix bug #19061. 2022-03-17 10:23:16 +08:00
tianshujie 012e475346 * Fix bug #18558. 2022-03-17 10:10:11 +08:00
tianshujie cd98938d02 * Fix bug #18344. 2022-03-17 10:05:02 +08:00
xieqiyu be11d0b786 * Fix bug#20381. 2022-03-17 09:55:37 +08:00
孙广明 f4cb0c03db Merge branch 'pailei2_xieqiyu_20850' into 'pailei2'
* Fix bug#20850.

See merge request easycorp/zentaopms!2315
2022-03-17 01:50:45 +00:00
李玉春 0e26c165c2 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
pailei2_sunhuawei_50407

See merge request easycorp/zentaopms!2319
2022-03-17 01:31:38 +00:00
mayue 04525fe425 Optimize code. 2022-03-17 09:16:35 +08:00
孙华伟 8ac07ad424 更新module/story/control.php 2022-03-17 01:10:43 +00:00
孙华伟 9270dbf6fa *Fix bug #17639 2022-03-17 08:45:04 +08:00
孙广明 8872899517 Merge branch 'pailei2_mayue_bug#17216' into 'pailei2'
Optimize code.

See merge request easycorp/zentaopms!2316
2022-03-16 09:18:32 +00:00
mayue 29574c3e85 * Fix bug #17216. 2022-03-16 17:13:07 +08:00
mayue f11f77d239 * Fix bug #20746. 2022-03-16 16:50:25 +08:00
xieqiyu 23a898218d * Fix bug#20850. 2022-03-16 16:28:32 +08:00
孙广明 ad09d2d6be Merge branch 'sprint/tianshujie_17734' into 'pailei2'
Sprint/tianshujie 17734

See merge request easycorp/zentaopms!2314
2022-03-16 08:25:00 +00:00
tianshujie 3e3cab4080 * Fix bug #20839. 2022-03-16 16:21:00 +08:00
tianshujie 050cefdbcd * Fix bug #20837. 2022-03-16 16:19:39 +08:00
tianshujie 18a386c06d * Fix bug #17734. 2022-03-16 16:10:52 +08: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