 zhangtao
|
484e584b67
|
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master
|
vor 1 Jahr |
|
zhangtao
|
62cc1c6f95
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
398b8d117e
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
5f94754f8c
|
add equipment
|
vor 1 Jahr |
|
zhangtao
|
ee5043b95e
|
Merge branch 'master' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
0c0e19cf36
|
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master
|
vor 1 Jahr |
|
zhangtao
|
cc189527a6
|
add hnlcpath
|
vor 1 Jahr |
|
zhangtao
|
c840be8599
|
add hnlcpath
|
vor 1 Jahr |
|
zhangtao
|
639c2eae16
|
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master
|
vor 1 Jahr |
|
zhangtao
|
d36190f295
|
add transferpage
|
vor 1 Jahr |
 yufei111
|
99eef9bb74
|
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master
|
vor 1 Jahr |
|
zhangtao
|
5205ce25cc
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
8dcebd6c21
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
a1208671ab
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
89bdc9cd22
|
删除操作按钮用户type判断
|
vor 1 Jahr |
|
zhangtao
|
f275bfafdc
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
921d441f13
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
7a4ff33475
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
4308e9aac6
|
登录去除admin校验
|
vor 1 Jahr |
|
yufei111
|
c5ecd04b7e
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
7bd4c4ccc6
|
合并
|
vor 1 Jahr |
|
余菲
|
352e0c22f4
|
获取用户信息之后再跳转
|
vor 1 Jahr |
|
zhangtao
|
75221cc7d9
|
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master
|
vor 1 Jahr |
|
zhangtao
|
5f773606fa
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
e516eafd53
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
58945344a2
|
merge
|
vor 1 Jahr |
|
zhangtao
|
3c0710c324
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
d6ce60b8fc
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
61a7b6f36b
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
88f87297e5
|
3791
|
vor 1 Jahr |
|
余菲
|
0790862cd3
|
3785
|
vor 1 Jahr |
|
zhangtao
|
676c46bbe4
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
a394a93336
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
d53f3d9786
|
新建用户增加用户类型选择
|
vor 1 Jahr |
|
余菲
|
84d6a0bedf
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
62f767c001
|
修改用户状态接口
|
vor 1 Jahr |
|
zhangtao
|
e32b0afffd
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
80c93bba9b
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
5b6b4e5d2a
|
合并
|
vor 1 Jahr |
|
zhangtao
|
2677e70773
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
51787c03cd
|
change version
|
vor 1 Jahr |
|
余菲
|
c86bc2fdec
|
刷新获取用户信息
|
vor 1 Jahr |
|
zhangtao
|
15da955c13
|
change auth
|
vor 1 Jahr |
|
zhangtao
|
e8d98032c7
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
e13cfd797c
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
b1683ef152
|
修改
|
vor 1 Jahr |
|
zhangtao
|
2aa26d4be3
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
11c6f73912
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
d26a42d1cb
|
分配权限
|
vor 1 Jahr |
|
yufei111
|
f4dc4f6d24
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
