Commit Graph
35174 Commits
Author SHA1 Message Date
zhouxin 2ab2af045c Fix bug #13855. 2022-03-18 07:17:07 +00:00
zhouxin 7bd4cb4418 Fix bug #14564. 2022-03-18 04:41:31 +00:00
zhouxin f280e32777 Fix bug #17415. 2022-03-18 02:43:14 +00:00
李玉春 3c80178924 Merge branch 'pailie_sunhao' into 'pailei2'
* update zui to change background color for label ".status-blocked".

See merge request easycorp/zentaopms!2351
2022-03-17 09:22:32 +00:00
Hao Sun a1b05a06d6 * update zui to change background color for label ".status-blocked". 2022-03-17 17:11:49 +08:00
李玉春 4d2981ca84 Merge branch 'pailei2_xieqiyu_16112' into 'pailei2'
* Fix bug#16112.

See merge request easycorp/zentaopms!2343
2022-03-17 09:04:53 +00:00
李玉春 92045688e8 Merge branch 'pailei2_sunhuawei_11010' into 'pailei2'
*Fix bug #11010.

See merge request easycorp/zentaopms!2334
2022-03-17 08:38:22 +00:00
李玉春 e624900d36 Merge branch 'sprint/pailei2_zhouxudong_20358' into 'pailei2'
* Fix bug #20358.

See merge request easycorp/zentaopms!2344
2022-03-17 08:37:46 +00:00
李玉春 cf6b1065ba Merge branch 'sprint/pailei2_zhouxudong_20121' into 'pailei2'
* Fix bug #20121.

See merge request easycorp/zentaopms!2345
2022-03-17 08:36:56 +00:00
zhouxudong c011895995 * Fix bug #20121. 2022-03-17 16:34:32 +08:00
孙华伟 ae1bc57c73 optimized code. 2022-03-17 16:11:53 +08:00
zhouxudong 66d4e9d25e * Fix bug #20358. 2022-03-17 16:05:13 +08:00
xieqiyu d2d05a6194 * Fix bug#16112. 2022-03-17 15:56:57 +08:00
李玉春 506dcfdc2d Merge branch 'pailei2_mayue_bug#15289' into 'pailei2'
* Fix bug #15289.

See merge request easycorp/zentaopms!2342
2022-03-17 07:55:03 +00:00
孙华伟 8f9b5c74e1 optimized code. 2022-03-17 15:47:52 +08:00
mayue e303b1c45b * Fix bug #15289. 2022-03-17 15:47:16 +08:00
孙华伟 2c457f6013 optimized code. 2022-03-17 15:45:51 +08:00
孙华伟 f06ccb25da *Fix new bug 2022-03-17 15:43:18 +08:00
李玉春 0a266251d8 Merge branch 'pailei2_zhouxin_50809' into 'pailei2'
Pailei2 zhouxin 50809

See merge request easycorp/zentaopms!2324
2022-03-17 07:24:24 +00:00
李玉春 de7939108a Merge branch 'pailei2_mayue_bug#14363' into 'pailei2'
* Fix bug #14363.

See merge request easycorp/zentaopms!2340
2022-03-17 06:55:07 +00:00
mayue f48f09fa0d Optimize code. 2022-03-17 14:52:02 +08:00
mayue 121dc576fb * Fix bug #14363. 2022-03-17 14:37:24 +08:00
李玉春 19973ac398 Merge branch 'sprint/pailei2_zhouxudong_16264' into 'pailei2'
* Fix bug #16264.

See merge request easycorp/zentaopms!2320
2022-03-17 06:28:41 +00:00
zhouxudong bf90e83326 * Fix bug #16264. 2022-03-17 14:27:34 +08:00
李玉春 72b050e02e Merge branch 'sprint/pailei2_zhouxudong_20832' into 'pailei2'
* Fix bug #20832.

See merge request easycorp/zentaopms!2339
2022-03-17 06:25:33 +00:00
zhouxudong 6b09aac4aa * Fix bug #20832. 2022-03-17 14:20:33 +08:00
孙广明 0542a65ed0 Merge branch 'pailei_sj_50765' into 'pailei2'
fixbug #19324

See merge request easycorp/zentaopms!2336
2022-03-17 06:02:46 +00:00
孙广明 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
孙华伟 3831ee1c15 *Fix bug #11010. 2022-03-17 13:36:49 +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
sunjun ab9a3bfc0a fixbug #19324 2022-03-17 13:33:15 +08:00
zhouxudong a778efdbb8 * Fix bug #16264. 2022-03-17 13:12:18 +08: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
zhouxin b9d8edc02a Fix bug #17224. 2022-03-17 02:51:52 +00: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
zhouxudong 9b49071863 * Fix bug #16264. 2022-03-17 09:39:27 +08: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