Commit Graph

2 Commits

Author SHA1 Message Date
lin
fac2195ace 重构播放器分享功能,为各处播放器增加播放器切换能力 2026-05-25 22:05:15 +08:00
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