From b73747138d4808a83448e11ee56e766553f511e4 Mon Sep 17 00:00:00 2001
From: xiaoQQya <46475319+xiaoQQya@users.noreply.github.com>
Date: 星期一, 06 十一月 2023 15:43:07 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into develop
---
src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
old mode 100644
new mode 100755
index d977c47..e20c3bf
--- a/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IDeviceService.java
@@ -5,7 +5,7 @@
import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import java.util.List;
@@ -162,7 +162,7 @@
* 鑾峰彇缁熻淇℃伅
* @return
*/
- ResourceBaceInfo getOverview();
+ ResourceBaseInfo getOverview();
/**
* 鑾峰彇鎵�鏈夎澶�
--
Gitblit v1.8.0