 zhangtao
|
f275bfafdc
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
 yufei111
|
921d441f13
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
7a4ff33475
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
pirms 1 gada |
|
余菲
|
4308e9aac6
|
登录去除admin校验
|
pirms 1 gada |
|
yufei111
|
c5ecd04b7e
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
7bd4c4ccc6
|
合并
|
pirms 1 gada |
|
余菲
|
352e0c22f4
|
获取用户信息之后再跳转
|
pirms 1 gada |
|
zhangtao
|
5f773606fa
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
zhangtao
|
e516eafd53
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
58945344a2
|
merge
|
pirms 1 gada |
|
zhangtao
|
3c0710c324
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
d6ce60b8fc
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
61a7b6f36b
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
pirms 1 gada |
|
余菲
|
88f87297e5
|
3791
|
pirms 1 gada |
|
余菲
|
0790862cd3
|
3785
|
pirms 1 gada |
|
zhangtao
|
676c46bbe4
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
a394a93336
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
d53f3d9786
|
新建用户增加用户类型选择
|
pirms 1 gada |
|
余菲
|
84d6a0bedf
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
pirms 1 gada |
|
余菲
|
62f767c001
|
修改用户状态接口
|
pirms 1 gada |
|
zhangtao
|
e32b0afffd
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
80c93bba9b
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
5b6b4e5d2a
|
合并
|
pirms 1 gada |
|
zhangtao
|
2677e70773
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
51787c03cd
|
change version
|
pirms 1 gada |
|
余菲
|
c86bc2fdec
|
刷新获取用户信息
|
pirms 1 gada |
|
zhangtao
|
15da955c13
|
change auth
|
pirms 1 gada |
|
zhangtao
|
e8d98032c7
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
e13cfd797c
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
b1683ef152
|
修改
|
pirms 1 gada |
|
zhangtao
|
2aa26d4be3
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
11c6f73912
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
d26a42d1cb
|
分配权限
|
pirms 1 gada |
|
yufei111
|
f4dc4f6d24
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
0c8f62039c
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
77bea6e341
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
pirms 1 gada |
|
余菲
|
8201e08476
|
登录后获取用户信息
|
pirms 1 gada |
|
zhangtao
|
09854cd83c
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
f5c76b4aa6
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
162f26d6f1
|
修改任务模块按钮显示逻辑
|
pirms 1 gada |
|
yufei111
|
b2ac9cfedd
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
4b032aa756
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
2a32445c38
|
修改小程序查询传参
|
pirms 1 gada |
|
yufei111
|
abb66ca93c
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
21db107ec8
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
190ee2150b
|
删除冗余代码
|
pirms 1 gada |
|
yufei111
|
d769b71547
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 1 gada |
|
yufei111
|
6be49ee454
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
3d1b5a4fd1
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
pirms 1 gada |
|
余菲
|
0c45b5abe3
|
设备管理模块新增按钮权限
|
pirms 1 gada |
