648540858 33abdb1db6 Merge branch 'master' into dev/数据库统合 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/control/cmd/DeviceControlQueryMessageHandler.java # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java # web_src/src/components/DeviceList.vue		2025-03-10 21:36:52 +08:00
..
初始化-mysql-2.7.3.sql	Merge branch 'master' into dev/数据库统合	2025-03-10 21:36:52 +08:00
初始化-postgresql-kingbase-2.7.3.sql	Merge branch 'master' into dev/数据库统合	2025-03-10 21:36:52 +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