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

..

main

Merge branch 'master' into 重构/1078

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

test/java/com/genersoft/iot/vmp/jt1078

[1078] 去除测试程序中的调用错误

2025-04-24 22:39:15 +08:00