lin 465e03d15d Merge branch 'master' into 重构/1078 ...

# Conflicts:
#	web/src/router/index.js
#	web/src/views/common/channelPlayer/chooseChannelForJt.vue
#	web/src/views/common/channelPlayer/jtDeviceEdit.vue
#	web/src/views/common/channelPlayer/jtDevicePlayer.vue
#	web_src/src/layout/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js

2025-07-03 09:41:55 +08:00

..

modules

Merge branch 'master' into 重构/1078

2025-07-03 09:41:55 +08:00

getters.js

增加新版本web页面

2025-04-28 15:04:06 +08:00

index.js

[1078] 合并新UI

2025-05-12 18:01:10 +08:00