 孙广明
|
59f717ddb9
|
* Fix bug #21804.
|
2022-04-21 16:34:31 +08:00 |
|
|
孙广明
|
57a39efdea
|
* Fix bug #17618.
|
2022-04-21 10:17:47 +08:00 |
|
|
王怡栋
|
ce9a48bf47
|
Merge branch 'fixbug' into 'master'
* Fix bug #21370 for update.
See merge request easycorp/zentaopms!3046
|
2022-04-21 02:11:50 +00:00 |
|
|
tanghucheng
|
37514f79c3
|
* Fix bug #21370 for update.
|
2022-04-21 02:08:47 +00:00 |
|
|
孙广明
|
1f3bbca59d
|
Merge branch 'dht_Webhook' into 'master'
add ztest
See merge request easycorp/zentaopms!3048
|
2022-04-21 02:01:44 +00:00 |
|
|
孙广明
|
27d12a861b
|
Merge branch 'dht_personnel' into 'master'
finish personnel unittest
See merge request easycorp/zentaopms!3045
|
2022-04-21 02:01:35 +00:00 |
|
|
denghongtao
|
b43b5266e5
|
add ztest
|
2022-04-21 09:55:32 +08:00 |
|
|
孙广明
|
6bc026840e
|
Merge branch 'sprint/master_zhouxudong_17536' into 'master'
Sprint/master zhouxudong 17536
See merge request easycorp/zentaopms!3047
|
2022-04-21 01:50:04 +00:00 |
|
|
zhouxudong
|
1741957f2d
|
* Fix bug from max #17536.
|
2022-04-21 09:48:13 +08:00 |
|
|
王怡栋
|
c5f4ad704e
|
Merge branch 'fixbug' into 'master'
* Fix bug #19142.
See merge request easycorp/zentaopms!3041
|
2022-04-21 01:34:48 +00:00 |
|
|
王怡栋
|
3e29be515f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *19360
See merge request easycorp/zentaopms!3029
|
2022-04-21 01:33:48 +00:00 |
|
|
Zongjun Lan
|
cc17a999ec
|
* fix code
|
2022-04-21 09:32:11 +08:00 |
|
|
孙广明
|
80f42f3c31
|
Merge branch 'sprint/fixbug_hufangzhou_19984' into 'master'
* Fix bug #19984.
See merge request easycorp/zentaopms!3044
|
2022-04-21 01:28:51 +00:00 |
|
|
hufangzhou
|
d4f1453db1
|
* Fix bug #19984.
|
2022-04-21 09:26:15 +08:00 |
|
|
denghongtao
|
d5f1179111
|
finish personnel unittest
|
2022-04-21 09:24:24 +08:00 |
|
|
孙广明
|
ac0eb8c657
|
Merge branch 'liyuchun_fixbug_21632' into 'master'
* Fix bug #21632.
See merge request easycorp/zentaopms!3024
|
2022-04-21 01:22:29 +00:00 |
|
|
孙广明
|
5f18c15827
|
Merge branch 'fixbug_sunjun_21811' into 'master'
*Fixbug_sunjun_21811
See merge request easycorp/zentaopms!3040
|
2022-04-21 01:17:53 +00:00 |
|
|
周旭东
|
a46767fc3d
|
Update control.php
|
2022-04-21 01:12:13 +00:00 |
|
|
周旭东
|
ee649fba71
|
Update zh-cn.php
|
2022-04-21 01:11:00 +00:00 |
|
|
zhouxudong
|
9f6fc42c11
|
* Fix bug from max #17536.
|
2022-04-21 09:09:00 +08:00 |
|
|
王怡栋
|
884c145ce2
|
Merge branch 'fixbug' into 'master'
* Fix bug #21846.
See merge request easycorp/zentaopms!3019
|
2022-04-21 00:44:21 +00:00 |
|
|
王怡栋
|
21c0fbb067
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-20 17:19:32 +08:00 |
|
|
王怡栋
|
54040e5777
|
* code for bug #16770.
|
2022-04-20 17:19:07 +08:00 |
|
|
孙广明
|
48c8950520
|
Merge branch 'sprint/scx_taskapi' into 'master'
* Fix bug #21677.
See merge request easycorp/zentaopms!3038
|
2022-04-20 09:18:38 +00:00 |
|
|
songchenxuan
|
efcc54d604
|
* Fix bug #21677.
|
2022-04-20 17:15:53 +08:00 |
|
|
孙广明
|
d68229bc53
|
Merge branch 'mayue_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!3037
|
2022-04-20 09:04:19 +00:00 |
|
|
mayue
|
05639579e0
|
* Fix bug.
|
2022-04-20 17:02:32 +08:00 |
|
|
sunjun
|
d2325e9b93
|
*Fixbug_sunjun_21811
|
2022-04-20 16:05:26 +08:00 |
|
|
朱金勇
|
17dbbe5401
|
Merge branch 'fixbug_wangxiaomeng_#21773_#21650' into 'master'
Fixbug wangxiaomeng #21773 ,21650.
See merge request easycorp/zentaopms!2990
|
2022-04-20 07:56:24 +00:00 |
|
|
李玉春
|
243dca8934
|
Merge branch 'bug_21823' into 'master'
Fix bug #21823,7042
See merge request easycorp/zentaopms!3032
|
2022-04-20 07:55:40 +00:00 |
|
|
wangxiaomeng
|
b635d1bf59
|
fixbug_21650 edit getByID.
|
2022-04-20 15:55:24 +08:00 |
|
|
李玉春
|
8d5631a4b1
|
Merge branch 'cyy_bug' into 'master'
* Add sudo param.
See merge request easycorp/zentaopms!3031
|
2022-04-20 07:53:09 +00:00 |
|
|
朱金勇
|
7c398a3840
|
Merge branch 'fixbug_wangxiaomeng#21834' into 'master'
fixbug_#21834.
See merge request easycorp/zentaopms!3036
|
2022-04-20 07:50:49 +00:00 |
|
|
李玉春
|
6aed6d4317
|
Merge branch 'sunhuawei_fixbug_15207' into 'master'
* Fix bug #15207.
See merge request easycorp/zentaopms!3035
|
2022-04-20 07:49:29 +00:00 |
|
|
朱金勇
|
abc12cd9ad
|
Merge branch 'sprint/sunhao/bug21867' into 'master'
* bug #21867, fix sub menu position in dropdown.
See merge request easycorp/zentaopms!3033
|
2022-04-20 07:47:31 +00:00 |
|
|
朱金勇
|
7df8158405
|
Merge branch 'sprint/sunhao/fix_avatar_display' into 'master'
* fix issue on show avatar.
See merge request easycorp/zentaopms!3025
|
2022-04-20 07:47:16 +00:00 |
|
|
孙华伟
|
d613f4ef2e
|
*Optimize the code.
|
2022-04-20 15:41:22 +08:00 |
|
|
wangxiaomeng
|
c49b50b422
|
fixbug_#21834.
|
2022-04-20 15:37:56 +08:00 |
|
|
孙广明
|
86a2d5bbad
|
Merge branch 'sprint/fixbug_hufangzhou_21875' into 'master'
* Fix bug #21875.
See merge request easycorp/zentaopms!3028
|
2022-04-20 07:37:28 +00:00 |
|
|
孙广明
|
08d7c0bf0f
|
Merge branch 'sprint/fixbug_hufangzhou_19716' into 'master'
* Fix bug #19716.
See merge request easycorp/zentaopms!3034
|
2022-04-20 07:36:43 +00:00 |
|
|
hufangzhou
|
146643d92b
|
* Fix bug #19716.
|
2022-04-20 15:30:17 +08:00 |
|
|
孙华伟
|
924b03bab4
|
* Fix bug #15207.
|
2022-04-20 15:29:49 +08:00 |
|
|
Hao Sun
|
80eb71850a
|
* bug #21867, fix sub menu position in dropdown.
|
2022-04-20 15:13:15 +08:00 |
|
|
孙广明
|
525365999a
|
Merge branch 'master_xieqiyu_21642' into 'master'
* Fix bug#21642.
See merge request easycorp/zentaopms!3030
|
2022-04-20 07:05:07 +00:00 |
|
|
liyuchun
|
816c36770d
|
* Fix bug #21878.
|
2022-04-20 15:00:13 +08:00 |
|
|
zenggang
|
7c159eeb96
|
* Fix bug #21823,7042
|
2022-04-20 06:58:50 +00:00 |
|
|
caoyanyi
|
243ef3e8fc
|
* Add sudo param.
|
2022-04-20 06:33:24 +00:00 |
|
|
xieqiyu
|
565ea292d3
|
* Fix bug#21642.
|
2022-04-20 14:31:47 +08:00 |
|
|
Zongjun Lan
|
a700b8994c
|
* fix bug *19360
|
2022-04-20 14:22:55 +08:00 |
|
|
王怡栋
|
eeb43664cb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-20 14:04:22 +08:00 |
|