648540858 5a7a7a12bd Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue		2023-06-27 16:46:26 +08:00
..
bean	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
gb28181	Merge branch 'wvp-28181-2.0' into main-dev	2023-06-27 16:46:26 +08:00
log	修复可空时间参数的校验 #784	2023-03-22 15:21:22 +08:00
record	优化跨域配置，支持同域的前后端分离部署	2023-03-05 09:53:26 +08:00
server	优化部分sql实现	2023-05-15 15:29:39 +08:00
streamProxy	修复录像下载，优化拉流代理接口	2023-06-07 20:15:08 +08:00
streamPush	优化异常处理以及级联设备状态查询	2023-03-17 13:22:05 +08:00
user	合并主线	2023-05-25 17:28:57 +08:00