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

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue

2023-01-13 16:21:17 +08:00

..

alarm

dialog去除以及异常情况处理优化

2022-09-23 23:15:39 +08:00

device

修复布防撤防 #717

2023-01-05 17:49:34 +08:00

gbStream

国标级联->选择通道支持移除目前下所有以及全部添加到目录下

2022-11-22 12:55:29 +08:00

media

优化接口

2022-12-23 16:52:30 +08:00

MobilePosition

dialog去除以及异常情况处理优化

2022-09-23 23:15:39 +08:00

platform

国标级联->选择通道支持移除目前下所有以及全部添加到目录下

2022-11-22 12:55:29 +08:00

play

Merge branch 'wvp-28181-2.0'

2023-01-13 16:21:17 +08:00

playback

修复国标录像回放以及录像下载

2023-01-06 11:43:27 +08:00

ptz

dialog去除以及异常情况处理优化

2022-09-23 23:15:39 +08:00

record

修复国标录像回放以及录像下载

2023-01-06 11:43:27 +08:00

SseController

依赖包版本升级

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