648540858 e6d9d65e51 Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # 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/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java # src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java		2023-07-13 14:47:24 +08:00
..
2.6.6-2.6.7更新.sql	新增设备主子码流选择（mysql语句）	2023-06-15 11:04:04 +08:00
2.6.8升级2.6.9.sql	增加备用字段	2023-07-02 00:03:21 +08:00
2.6.8补丁更新.sql	合并主线的发流端口管理逻辑	2023-07-10 14:30:59 +08:00
clean.sql	兼容人大金仓对online作为保留字段的要求	2023-05-16 15:13:38 +08:00
初始化.sql	增加备用字段	2023-07-02 12:40:41 +08:00