Commit Graph
37888 Commits
Author SHA1 Message Date
孙广明 514aa68dc9 Merge branch 'sprint/fixbug_hufangzhou_18167' into 'master'
* Fix bug #18167.

See merge request easycorp/zentaopms!3086
2022-04-22 07:37:27 +00:00
hufangzhou 98153aa83b * Rename the variable. 2022-04-22 15:37:10 +08:00
hufangzhou 0c57308663 * Fix bug #18167. 2022-04-22 15:29:27 +08:00
wangyidong 8c9bf2550f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-22 15:29:21 +08:00
wangyidong a08edd3336 * adjust for repo. 2022-04-22 15:29:06 +08:00
王怡栋 ff8ad82f8f Merge branch 'sprint/tianshujie_bug21916' into 'master'
Sprint/tianshujie bug21916

See merge request easycorp/zentaopms!3085
2022-04-22 07:15:47 +00:00
田淑杰 dffd633c11 * Fix bug #21917. 2022-04-22 15:11:37 +08:00
孙广明 10496fd993 Merge branch 'sprint/master_zhouxudong_16729' into 'master'
* Fix bug from max #16729.

See merge request easycorp/zentaopms!3080
2022-04-22 06:55:14 +00:00
王怡栋 089661adc6 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18855

See merge request easycorp/zentaopms!3083
2022-04-22 06:44:49 +00:00
王怡栋 fa729e5a22 Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3084
2022-04-22 06:44:06 +00:00
孙广明 57e90b8dbc * Fix bug for qiqi. 2022-04-22 14:42:22 +08:00
孙广明 8dec8a485b * Fix bug for qiqi. 2022-04-22 14:31:06 +08:00
孙广明 6509056a9e * Fix bug for qiqi. 2022-04-22 14:27:32 +08:00
Zongjun Lan c6678ed77b * fix bug undefined from 2022-04-22 14:16:08 +08:00
田淑杰 2aca0841d5 * Fix bug #21916. 2022-04-22 14:06:43 +08:00
Zongjun Lan c80e84b73e * fix bug #18855 2022-04-22 14:00:33 +08:00
王怡栋 0559230b1c Merge branch 'sprint/fixbug_liumengyi_3079' into 'master'
* Fix bug #3079.

See merge request easycorp/zentaopms!3081
2022-04-22 05:59:27 +00:00
李玉春 449ba6884d Merge branch 'sprint/tianshujie_sql' into 'master'
* Modify the sql statement.

See merge request easycorp/zentaopms!3078
2022-04-22 05:38:07 +00:00
孙广明 49b9ba0d04 Merge branch 'fixbugs_zhouxin_21934' into 'master'
* Fix bug #21934.

See merge request easycorp/zentaopms!3082
2022-04-22 05:36:49 +00:00
孙广明 b46946fe22 Merge branch 'sprint/fixerror_hufangzhou_apilib' into 'master'
* Fix code error.

See merge request easycorp/zentaopms!3076
2022-04-22 05:23:17 +00:00
zhouxin 0fc5c5cba6 * Fix bug #21934. 2022-04-22 05:14:53 +00:00
liumengyi 0c3aa457ce * Fix bug #3079. 2022-04-22 13:12:02 +08:00
zhouxudong aaffd2788c * Fix bug from max #16729. 2022-04-22 13:07:10 +08:00
王怡栋 814599788b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18933

See merge request easycorp/zentaopms!3067
2022-04-22 03:40:20 +00:00
李玉春 a60af77cfa Merge branch 'bug_21893' into 'master'
Fix bug#21893

See merge request easycorp/zentaopms!3068
2022-04-22 03:20:09 +00:00
李玉春 b3f42a5b4a Merge branch 'cyy_21898' into 'master'
* Fix bug #21898.

See merge request easycorp/zentaopms!3074
2022-04-22 03:19:44 +00:00
孙广明 b86fac6597 Merge branch 'sprint/scx_storybug' into 'master'
* Fix create substory bug.

See merge request easycorp/zentaopms!3077
2022-04-22 03:08:54 +00:00
王怡栋 f8ef430ad6 * fix error. 2022-04-22 10:59:30 +08:00
songchenxuan 124465c1b4 * Fix create substory bug. 2022-04-22 10:57:02 +08:00
hufangzhou b3875425fe * Fix code error. 2022-04-22 10:52:03 +08:00
王怡栋 4aa567757b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-22 10:41:19 +08:00
王怡栋 b9eab52620 * fix vulnerability. 2022-04-22 10:38:41 +08:00
Zongjun Lan e2cfcf4e8d * fix param name 2022-04-22 10:34:12 +08:00
zenggang 0ef2e99bca * Fix bug#21876 2022-04-22 02:29:51 +00:00
孙广明 61cfa6cd62 Merge branch 'sprint/master_zhouxudong_15833' into 'master'
* Fix bug from max #15833.

See merge request easycorp/zentaopms!3073
2022-04-22 02:09:28 +00:00
田淑杰 4588b9c103 * Modify the sql statement. 2022-04-22 10:07:42 +08:00
孙广明 5d878203a0 Merge branch 'sprint/hufangzhou_story_32201' into 'master'
* Code for story #32201.

See merge request easycorp/zentaopms!3075
2022-04-22 01:53:06 +00:00
hufangzhou abca99908b * Code for story #32201. 2022-04-22 09:49:59 +08:00
朱金勇 9c0e752948 Merge branch 'fixbug_wangxiaomeng#21650' into 'master'
fixbug_21650.

See merge request easycorp/zentaopms!3062
2022-04-22 01:37:26 +00:00
朱金勇 4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master'
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
2022-04-22 01:36:54 +00:00
caoyanyi f181738957 * Fix bug #21898. 2022-04-22 01:33:55 +00:00
zhouxudong 5a8089c3fb * Fix bug from max #15833. 2022-04-22 09:30:05 +08:00
孙广明 d944077e90 Merge branch 'master_xieqiyu_2442' into 'master'
* Fix bug#2442.

See merge request easycorp/zentaopms!3070
2022-04-22 01:23:21 +00:00
xieqiyu 4d65e01a38 * Fix bug#2442. 2022-04-22 09:00:55 +08:00
孙广明 c37e1ef5b6 Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3069
2022-04-22 00:50:58 +00:00
sunjun cce29cd63c *Fixbug_21140 2022-04-22 08:48:03 +08:00
Zongjun Lan 1a4d40bae0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-22 08:47:36 +08:00
孙广明 951fd2c19f Merge branch 'zry_app' into 'master'
* Fix api for story USR.

See merge request easycorp/zentaopms!3056
2022-04-21 09:21:33 +00:00
zenggang c7f61807c8 * Fix bug#21893 2022-04-21 09:13:05 +00:00
孙广明 fa83e638cf Merge branch 'master_xieqiyu_21896' into 'master'
* Fix bug#21896.

See merge request easycorp/zentaopms!3066
2022-04-21 09:07:10 +00:00