From a860a554680453f533328858a525e663a22e86ed Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 31 Oct 2023 10:20:49 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb20231030

---
 screen-api/src/main/java/com/moral/api/service/DeviceService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index 923d79b..605b619 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -51,4 +51,18 @@
             */
     Device getDeviceUnitAlramInforByMac(String mac);
 
+    /**
+     * ������������
+     * @param mac
+     * @return
+     */
+    List<Device> getFuzzySearch(String mac);
+
+    /**
+     * ������������������������
+     * @param id
+     * @return
+     */
+    List<Device> getOrganizationDevice(Integer id);
+
 }

--
Gitblit v1.8.0