From de71d925566922784d315ef86045528a651dd07c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 16:35:03 +0800
Subject: [PATCH] 更改报表导出时间段

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

diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index cc47109..0789f53 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -80,8 +80,14 @@
 
 	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);
+
+	List<Device> getDeviceByCode();
 }

--
Gitblit v1.8.0