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
..
main	Merge branch 'wvp-28181-2.0' into 结构优化	2023-12-19 17:27:50 +08:00
test/java/com/genersoft/iot/vmp/jt1078	1、新增视频回放、视频回放控制Template	2023-04-28 14:39:50 +08:00