648540858 ecf4fbb684 Merge branch 'wvp-28181-2.0' ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue

2022-08-22 16:53:16 +08:00

..

AudioBroadcastManager.java

优化语音广播流程

2022-05-10 13:08:32 +08:00

CatalogDataCatch.java

修复级联无通道时更新停止在等待更新的问题

2022-07-25 09:44:43 +08:00

RecordDataCatch.java

支持全局异常和统一返回结果，未完待续

2022-08-22 16:17:28 +08:00

SsrcConfig.java

依赖包版本升级

2022-08-19 17:11:51 +08:00

VideoStreamSessionManager.java

支持全局异常和统一返回结果，未完待续

2022-08-22 16:17:28 +08:00