648540858 b7f2a6b25b Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java		2023-06-07 20:21:10 +08:00
..
bean	优化截图获取接口	2023-06-05 11:10:15 +08:00
gb28181	优化截图获取接口	2023-06-05 11:10:15 +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	修复使用jwt后导致的用户管理功能异常	2023-04-15 09:03:41 +08:00