Commit Graph
38111 Commits
Author SHA1 Message Date
孙广明 debd3fd2a4 Merge branch 'fixbugs_zhouxin_22044' into 'master'
* Fix bug #22044.

See merge request easycorp/zentaopms!3172
2022-04-28 01:36:40 +00:00
zhouxin a470e1e83e * Fix bug #22044. 2022-04-28 01:29:42 +00:00
李玉春 648179b129 Merge branch 'bug_2942' into 'master'
Fix bug#2942,15431,21981

See merge request easycorp/zentaopms!3160
2022-04-28 00:10:45 +00:00
王怡栋 ec08b7bfcc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22008

See merge request easycorp/zentaopms!3162
2022-04-27 09:29:23 +00:00
王怡栋 56f4a1a6df Merge branch 'fixbug' into 'master'
* Fix bug #15677.

See merge request easycorp/zentaopms!3156
2022-04-27 09:28:49 +00:00
tanghucheng c781eadd94 * Fix bug. 2022-04-27 17:28:08 +08:00
朱金勇 1c583ab383 Merge branch 'sprint/fixbug_hufangzhou_15831' into 'master'
* Fix bug #15831.

See merge request easycorp/zentaopms!3170
2022-04-27 09:02:14 +00:00
hufangzhou 4f4ab1e720 * Fix bug #15831. 2022-04-27 17:00:15 +08:00
孙广明 9ba307bbc2 Merge branch 'master_xieqiyu_22021' into 'master'
* Fix bug#22021.

See merge request easycorp/zentaopms!3155
2022-04-27 08:45:39 +00:00
孙广明 7f86bf07ce Merge branch 'sprint/master_zhouxudong_22027' into 'master'
* Fix bug #22027.

See merge request easycorp/zentaopms!3166
2022-04-27 08:45:23 +00:00
孙广明 90f1a3e783 Merge branch 'master_xieqiyu_22009' into 'master'
* Fix bug#22009.

See merge request easycorp/zentaopms!3168
2022-04-27 08:44:36 +00:00
孙广明 d3f34c1748 Merge branch 'sprint/scx_settingapi' into 'master'
* Add bug->productStatus and task->executionStatus .

See merge request easycorp/zentaopms!3169
2022-04-27 08:43:18 +00:00
孙广明 01fbd6c913 Merge branch 'fixbug_sunjun_22007' into 'master'
*Fixbug_sunjun_22007

See merge request easycorp/zentaopms!3165
2022-04-27 08:42:05 +00:00
= a2f3cfc2da * Add bug->productStatus and task->executionStatus . 2022-04-27 16:37:39 +08:00
朱金勇 90a29b0743 Merge branch 'sprint/fixbug_hufangzhou_15599' into 'master'
* Fix bug #15599.

See merge request easycorp/zentaopms!3164
2022-04-27 08:20:44 +00:00
朱金勇 e8f3deb0af Merge branch 'sprint/fixbug_hufangzhou_22039' into 'master'
* Fix bug #22039.

See merge request easycorp/zentaopms!3161
2022-04-27 08:20:19 +00:00
朱金勇 8b4e68b5a4 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3159
2022-04-27 08:19:56 +00:00
zhengrunyu 00dda5315a * Change function name. 2022-04-27 16:17:08 +08:00
xieqiyu d02933e690 * Fix bug#22009. 2022-04-27 16:16:33 +08:00
zhouxudong 66648d3722 * Fix bug #22027. 2022-04-27 08:03:08 +00:00
sunjun 0495a32a20 *Fixbug_sunjun_22007 2022-04-27 07:59:37 +00:00
hufangzhou 8907f7c898 * Fix bug #15599. 2022-04-27 15:53:18 +08:00
lanzongjun edb3c69e87 * fix bug #22008 2022-04-27 15:27:05 +08:00
hufangzhou 1235dd8101 * Fix bug #22039. 2022-04-27 15:24:30 +08:00
zenggang f81b53bc38 * Fix bug#2942,15431,21981 2022-04-27 07:23:08 +00:00
zhengrunyu 9bd5524ef3 * Add remark. 2022-04-27 15:21:20 +08:00
zhengrunyu 18e2cdb71c * Add block. 2022-04-27 15:19:59 +08:00
孙广明 824c376235 Merge branch 'fixbugs_zhouxin_21929' into 'master'
* Fix bug 21929.

See merge request easycorp/zentaopms!3158
2022-04-27 07:15:38 +00:00
朱金勇 a78a1d6bff Merge branch 'sprint/fixbug_hufangzhou_18866' into 'master'
* Fix bug #18866.

See merge request easycorp/zentaopms!3157
2022-04-27 07:14:51 +00:00
zhouxin 6532164bcd * Fix bug 21929. 2022-04-27 07:13:32 +00:00
zhengrunyu 6f18ae83c2 * Add model function to static. 2022-04-27 15:01:46 +08:00
hufangzhou ec6e3e5a42 * Fix bug #18866. 2022-04-27 14:39:22 +08:00
朱金勇 fe9ef3556d Merge branch 'sprint/fixbug_hufangzhou_15740' into 'master'
* Fix bug #15740.

See merge request easycorp/zentaopms!3154
2022-04-27 06:38:56 +00:00
朱金勇 5f8f8a395d Merge branch 'sprint/fixbug_hufangzhou_15681' into 'master'
* Fix bug #15681.

See merge request easycorp/zentaopms!3152
2022-04-27 06:38:42 +00:00
王怡栋 80e6f3b16b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21988

See merge request easycorp/zentaopms!3153
2022-04-27 06:33:30 +00:00
lanzongjun cef78f131e * fix code format 2022-04-27 14:32:35 +08:00
tanghucheng f4666d8384 * Fix bug #15677. 2022-04-27 14:21:00 +08:00
xieqiyu 7f2e6b0fcc * Fix bug#22021. 2022-04-27 14:03:55 +08:00
hufangzhou b3c5aad263 * Fix bug #15740. 2022-04-27 13:58:36 +08:00
lanzongjun 9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
wangyidong 504e73339b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-27 13:41:02 +08:00
wangyidong 701d007a9f * code for bug #22030. 2022-04-27 13:40:47 +08:00
hufangzhou 474ef7cb85 * Fix bug #15681. 2022-04-27 13:39:32 +08:00
孙广明 1a2d26b8cc Merge branch 'mayue_fix_bug#21706' into 'master'
* Fix bug #21706.

See merge request easycorp/zentaopms!3151
2022-04-27 05:38:17 +00:00
mayue 36bd7d298d * Fix bug #21706. 2022-04-27 13:34:55 +08:00
朱金勇 1a99c23927 Merge branch 'sprint/fixbug_hufangzhou_15612' into 'master'
Fix bug #15612.

See merge request easycorp/zentaopms!3150
2022-04-27 05:30:48 +00:00
朱金勇 cf09a53518 Merge branch 'sprint/fixbug_hufangzhou_15654' into 'master'
* Fix bug #15654.

See merge request easycorp/zentaopms!3147
2022-04-27 05:30:22 +00:00
孙广明 7376785491 Merge branch 'sprint/master_zhouxudong_22022' into 'master'
* Fix bug #22022.

See merge request easycorp/zentaopms!3143
2022-04-27 05:25:44 +00:00
孙广明 442db6faa3 Merge branch 'sprint/master_zhouxudong_22024' into 'master'
Sprint/master zhouxudong 22024

See merge request easycorp/zentaopms!3146
2022-04-27 05:25:34 +00:00
hufangzhou e9ef78de3d Fix bug #15612. 2022-04-27 13:11:35 +08:00