From cd264145f9b4107f1430da46269dd306d26f3116 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Mon, 16 Nov 2020 13:16:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/moral/service/DeviceService.java | 8 ++++++-- 1 files changed, 6 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..0789f53 100644 --- a/src/main/java/com/moral/service/DeviceService.java +++ b/src/main/java/com/moral/service/DeviceService.java @@ -80,10 +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