From ed28f15efe490b59126545de188a325ddb06af39 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Nov 2020 13:39:25 +0800
Subject: [PATCH] 大屏设备数据导出excel接口更新

---
 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 cc47109..06e5674 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -80,8 +80,10 @@
 
 	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);
 }

--
Gitblit v1.8.0