From f0b5148973e9437f3651153e53f8f336c4c3c6ff Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 22 Oct 2020 11:19:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/DeviceService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index 8064130..ca06f17 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -83,5 +83,7 @@
 	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String time,String tab);
 	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String time,String tab);
 
-	DeviceAndWind getDeviceAndWindByMac(String mac,String time,String table);
+	List<Device> getDeviceByCodeAndId(String code,String id);
+
+	String byMacGetOrgId(String mac);
 }

--
Gitblit v1.8.0