From bb77c5e3089fc3e9ccb520625b7798d81c99bfa2 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 13:55:15 +0800
Subject: [PATCH] update

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index ca06f17..a59ca69 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -80,10 +80,12 @@
 
 	Device byMacGetDevice(String mac);
 
-	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String time,String tab);
-	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String time,String tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWind(String id,String tab);
+	List<DeviceAndWind> byMonitorIdGetDeviceAndWindSpecial(String id,String tab);
 
 	List<Device> getDeviceByCodeAndId(String code,String id);
 
 	String byMacGetOrgId(String mac);
+	//������mac������������������������������������
+	List<Device> getDevice(String macOrName);
 }

--
Gitblit v1.8.0