648540858 7cbc8c5fc2 Merge branch 'wvp-28181-2.0' into 结构优化 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platform/PlatformController.java		2024-03-04 17:55:01 +08:00
..
java/com/genersoft/iot/vmp	Merge branch 'wvp-28181-2.0' into 结构优化	2024-03-04 17:55:01 +08:00
resources	Merge branch 'wvp-28181-2.0' into 结构优化	2024-01-31 17:26:00 +08:00