From e259be9268db90b4e73a325abea24ad59ff0e4e3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 27 十月 2021 16:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index 223a5e8..266c945 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -374,4 +374,6 @@
 	void updateMediaServer(MediaServerItem mediaServerItem);
 
 	List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean b);
+
+    Device queryVideoDeviceByChannelId(String platformGbId);
 }

--
Gitblit v1.8.0