From bedaf7891ee030911ac8ce3e1be525db22acafd8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 八月 2021 18:04:05 +0800
Subject: [PATCH] Merge pull request #151 from lawrencehj/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index be9959a..f65a155 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.service;
 
-import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
@@ -15,6 +14,8 @@
 
     List<MediaServerItem> getAll();
 
+    List<MediaServerItem> getAllFromDatabase();
+
     List<MediaServerItem> getAllOnline();
 
     MediaServerItem getOne(String generalMediaServerId);

--
Gitblit v1.8.0