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
..
2.6.9	合并269分支修复的内容	2024-01-10 19:14:11 +08:00
2.7.0	支持支持主码流子码流切换	2024-02-22 17:22:28 +08:00
old	优化数据库	2024-01-03 15:58:01 +08:00
结构优化	catqlog查询支持回复平台信息	2024-01-30 00:00:49 +08:00
初始化-mysql.sql	临时提交	2024-01-19 14:33:34 +08:00
初始化-postgresql-kingbase.sql	临时提交	2024-01-19 14:33:34 +08:00