lin b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java # src/main/resources/配置详情.yml		2025-02-11 19:30:20 +08:00
..
初始化-mysql-2.7.3.sql	Merge branch 'refs/heads/master' into dev/数据库统合2	2025-02-11 19:30:20 +08:00
初始化-postgresql-kingbase-2.7.3.sql	Merge branch 'refs/heads/master' into dev/数据库统合2	2025-02-11 19:30:20 +08:00
数据库统合-更新.sql	[集群-自动切换过国标级联] 添加数据库脚本	2025-01-02 14:29:13 +08:00
更新-mysql-2.7.3.sql	调整心跳间隔的设置机制以及状态的判断	2025-02-11 18:16:05 +08:00
更新-postgresql-kingbase-2.7.3.sql	调整心跳间隔的设置机制以及状态的判断	2025-02-11 18:16:05 +08:00