 余菲
|
190ee2150b
|
删除冗余代码
|
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 |
|
yufei111
|
93d560b207
|
Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
余菲
|
59a98cd27b
|
新增菜单管理、角色管理、小程序菜单管理等模块、修改人员管理不分逻辑
|
pirms 1 gada |
|
余菲
|
006511391f
|
合并
|
pirms 1 gada |
|
余菲
|
a56652437c
|
对接菜单权限
|
pirms 1 gada |
 zhangtao
|
902f5dd422
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
eb55820ed1
|
change srt_type
|
pirms 1 gada |
|
zhangtao
|
f861861ceb
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
f070117aad
|
add srt_type
|
pirms 1 gada |
 吴迪
|
e38ccc5c81
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
吴迪
|
05842e9625
|
上传进度条
|
pirms 1 gada |
|
吴迪
|
58c2ee56db
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
吴迪
|
9fee125dc1
|
是否直播
|
pirms 1 gada |
|
zhangtao
|
d1ccedcfa1
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
ccab0c7512
|
change table siwtch
|
pirms 1 gada |
|
吴迪
|
c5e9495c50
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
吴迪
|
ba620b6d6c
|
sdk报错
|
pirms 1 gada |
|
zhangtao
|
0387e1fc5a
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
2569d29b82
|
change live value
|
pirms 1 gada |
|
zhangtao
|
a8005c4405
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
c1e0f11f03
|
delete $message error
|
pirms 1 gada |
|
zhangtao
|
7dbc70a580
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into zhangtao
|
pirms 1 gada |
|
zhangtao
|
b33ab24c3c
|
change env
|
pirms 1 gada |
|
zhangtao
|
21b995cbe2
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
420604cce9
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into zhangtao
|
pirms 1 gada |
|
zhangtao
|
8791e7f10e
|
change VITE_REDIRECT_URI
|
pirms 1 gada |
|
zhangtao
|
d2e3af4e71
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
3fec278969
|
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_pilot_web into zhangtao
|
pirms 1 gada |
|
zhangtao
|
412c63f3e0
|
change test oidc
|
pirms 1 gada |
|
余菲
|
0d5fc4e9c4
|
修改
|
pirms 1 gada |
|
zhangtao
|
4f888e4b6c
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 1 gada |
|
zhangtao
|
4900fa86a3
|
change test oidc authority
|
pirms 1 gada |
|
zhangtao
|
2db64ace46
|
add readme
|
pirms 1 gada |
|
zhangtao
|
18735e79d9
|
Merge branch 'hotfix' of gitadmin/tuoheng_pilot_web into master
|
pirms 1 gada |
|
zhangtao
|
a6b7bd58fc
|
add log
|
pirms 2 gadiem |
|
zhangtao
|
a6d59c1e1a
|
add log
|
pirms 2 gadiem |
|
吴迪
|
534cfb09e7
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
pirms 2 gadiem |
|
吴迪
|
0d306a0bd1
|
marker二次bug
|
pirms 2 gadiem |
|
zhangtao
|
57d1bcb017
|
change modal show
|
pirms 2 gadiem |
|
吴迪
|
c928c37127
|
Merge branch 'wudi' of gitadmin/tuoheng_pilot_web into develop
|
pirms 2 gadiem |
|
吴迪
|
5027327e0f
|
marker图标
|
pirms 2 gadiem |
|
zhangtao
|
3e3f0e07c3
|
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master
|
pirms 2 gadiem |
|
zhangtao
|
1b60656df9
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 2 gadiem |
|
zhangtao
|
29fc90831f
|
Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop
|
pirms 2 gadiem |
|
zhangtao
|
caa6b4a235
|
delete api
|
pirms 2 gadiem |
|
zhangtao
|
e33b9ed6e6
|
Merge branch 'master' of gitadmin/tuoheng_pilot_web into develop
|
pirms 2 gadiem |
|
zhangtao
|
2f7b8001e2
|
Merge branch 'release' of gitadmin/tuoheng_pilot_web into master
|
pirms 2 gadiem |
|
zhangtao
|
01d5a47886
|
Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release
|
pirms 2 gadiem |
