From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/mapper/DeviceMapper.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 8135b01..a30d2e1 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -89,4 +89,11 @@
     List<Map<String, Object>> getDevicesByMpId(int mpId);
 
     String byMacGetOrgId(String mac);
+
+    List<Device> getDevice(String macOrName);
+
+
+    List<Device> getDeviceByCityCode();
+
+
 }
\ No newline at end of file

--
Gitblit v1.8.0