From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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