 李玉春
|
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 |
|
|
王怡栋
|
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 |
|
|
李玉春
|
59108747ce
|
Merge branch 'sprint/tianshujie_18060' into 'master'
Sprint/tianshujie 18060
See merge request easycorp/zentaopms!3061
|
2022-04-21 08:55:43 +00:00 |
|
|
tianshujie
|
0a5ef1e4fa
|
* Fix bug #18060.
|
2022-04-21 16:51:57 +08:00 |
|
|
Zongjun Lan
|
6ff7ac0d24
|
* fix bug #18933
|
2022-04-21 16:49:56 +08:00 |
|
|
xieqiyu
|
4abb324459
|
* Fix bug#21896.
|
2022-04-21 16:46:09 +08:00 |
|
|
朱金勇
|
d17a38d658
|
Merge branch 'sprint/sunhao/optimize_picker_in_search' into 'master'
* fix picker control not initialized in search form.
See merge request easycorp/zentaopms!3039
|
2022-04-21 08:37:25 +00:00 |
|
|
朱金勇
|
2377d27cf2
|
Merge branch 'sgm_fixbug' into 'master'
* Fix bug #21804.
See merge request easycorp/zentaopms!3065
|
2022-04-21 08:37:11 +00:00 |
|
|
孙广明
|
59f717ddb9
|
* Fix bug #21804.
|
2022-04-21 16:34:31 +08:00 |
|
|
孙广明
|
d4f02a3d88
|
Merge branch 'mayue_fix_bug#19933#21785' into 'master'
* Fix bug #19933#21785.
See merge request easycorp/zentaopms!3064
|
2022-04-21 08:32:51 +00:00 |
|
|
mayue
|
5da98433b6
|
* Fix bug #19933#21785.
|
2022-04-21 16:30:32 +08:00 |
|
|
王怡栋
|
f93e474e26
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18934#21853
See merge request easycorp/zentaopms!3063
|
2022-04-21 08:24:08 +00:00 |
|
|
Zongjun Lan
|
2414c6d1dc
|
* fix bug #18934
|
2022-04-21 16:23:16 +08:00 |
|
|
孙广明
|
1b62b01fe8
|
Merge branch 'liyuchun_fixbug_20178' into 'master'
* Fix bug #20178.
See merge request easycorp/zentaopms!3060
|
2022-04-21 08:19:26 +00:00 |
|
|
Zongjun Lan
|
7e63a02e20
|
* fix bug #18934
|
2022-04-21 16:09:34 +08:00 |
|
|
wangxiaomeng
|
8cec8ea0bd
|
fixbug_21650.
|
2022-04-21 16:00:44 +08:00 |
|
|
tianshujie
|
ec0faba808
|
* Fix bug #18060.
|
2022-04-21 15:59:45 +08:00 |
|
|
liyuchun
|
6726e65206
|
* Fix bug #20178.
|
2022-04-21 15:59:21 +08:00 |
|
|
tianshujie
|
edbc8e5d0b
|
* Fix bug #18060.
|
2022-04-21 15:52:57 +08:00 |
|
|
王怡栋
|
89e1854932
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-21 15:39:05 +08:00 |
|
|
王怡栋
|
7ae35d4a12
|
* fix bug #21806.
|
2022-04-21 15:38:33 +08:00 |
|