648540858 d41d6b34af Merge branch 'refs/heads/2.7.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java # src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java # src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java # src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java # src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java		2024-04-23 20:59:20 +08:00
..
初始化-mysql-2.7.0.sql	Merge branch '2.7.0'	2024-04-12 16:05:48 +08:00
初始化-postgresql-kingbase-2.7.0.sql	Merge branch '2.7.0'	2024-04-12 16:05:48 +08:00
更新-mysql-2.7.0.sql	修复目录订阅发送订阅未携带经纬度的问题	2024-04-15 15:51:10 +08:00
更新-postgresql-kingbase-2.7.0.sql	修复目录订阅发送订阅未携带经纬度的问题	2024-04-15 15:51:10 +08:00