648540858 6d0361edf8 Merge branch 'wvp-28181-2.0' into 结构优化 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java		2023-12-19 17:27:50 +08:00
..
2.6.6-2.6.7更新.sql	新增设备主子码流选择（mysql语句）	2023-06-15 11:04:04 +08:00
2.6.8升级2.6.9.sql	增加备用字段	2023-07-02 00:03:21 +08:00
2.6.8补丁更新.sql	合并主线的发流端口管理逻辑	2023-07-10 14:30:59 +08:00
2.6.9更新.sql	Merge branch 'wvp-28181-2.0' into 结构优化	2023-12-19 17:27:50 +08:00
clean.sql	兼容人大金仓对online作为保留字段的要求	2023-05-16 15:13:38 +08:00
common.sql	临时提交	2023-12-18 23:44:37 +08:00
初始化.sql	临时提交	2023-12-08 18:05:14 +08:00