 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 |
|
yufei111
|
0c8f62039c
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
77bea6e341
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
8201e08476
|
登录后获取用户信息
|
vor 1 Jahr |
|
zhangtao
|
09854cd83c
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
f5c76b4aa6
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
162f26d6f1
|
修改任务模块按钮显示逻辑
|
vor 1 Jahr |
|
yufei111
|
b2ac9cfedd
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
4b032aa756
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
2a32445c38
|
修改小程序查询传参
|
vor 1 Jahr |
|
yufei111
|
abb66ca93c
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
21db107ec8
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
190ee2150b
|
删除冗余代码
|
vor 1 Jahr |
|
yufei111
|
d769b71547
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
6be49ee454
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
3d1b5a4fd1
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into yufei
|
vor 1 Jahr |
|
余菲
|
0c45b5abe3
|
设备管理模块新增按钮权限
|
vor 1 Jahr |
|
zhangtao
|
421afaaaa3
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
yufei111
|
93d560b207
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
余菲
|
59a98cd27b
|
新增菜单管理、角色管理、小程序菜单管理等模块、修改人员管理不分逻辑
|
vor 1 Jahr |
|
余菲
|
006511391f
|
合并
|
vor 1 Jahr |
|
余菲
|
a56652437c
|
对接菜单权限
|
vor 1 Jahr |
|
zhangtao
|
d8f2d0ac16
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
902f5dd422
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
eb55820ed1
|
change srt_type
|
vor 1 Jahr |
|
zhangtao
|
e94d555fc6
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
f861861ceb
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
f070117aad
|
add srt_type
|
vor 1 Jahr |
 吴迪
|
e38ccc5c81
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
吴迪
|
05842e9625
|
上传进度条
|
vor 1 Jahr |
|
zhangtao
|
77f87c1e93
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
吴迪
|
58c2ee56db
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
吴迪
|
9fee125dc1
|
是否直播
|
vor 1 Jahr |
|
zhangtao
|
d1ccedcfa1
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
ccab0c7512
|
change table siwtch
|
vor 1 Jahr |
|
zhangtao
|
7c0ed5ad1a
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
吴迪
|
c5e9495c50
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
吴迪
|
ba620b6d6c
|
sdk报错
|
vor 1 Jahr |
|
zhangtao
|
fb7f7754a7
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
0387e1fc5a
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
2569d29b82
|
change live value
|
vor 1 Jahr |
|
zhangtao
|
a69b0327ff
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
vor 1 Jahr |
|
zhangtao
|
a8005c4405
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
vor 1 Jahr |
|
zhangtao
|
c1e0f11f03
|
delete $message error
|
vor 1 Jahr |
