From 418970eab27d313307d60fd4f2a187efcea260ff Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期一, 01 三月 2021 18:13:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java b/src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java index 898c014..963fc8c 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java @@ -1,12 +1,9 @@ package com.genersoft.iot.vmp.vmanager.service; import com.alibaba.fastjson.JSONObject; -import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe; import com.genersoft.iot.vmp.vmanager.play.bean.PlayResult; -import org.springframework.http.ResponseEntity; -import org.springframework.web.context.request.async.DeferredResult; /** * 鐐规挱澶勭悊 -- Gitblit v1.8.0