From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index bcdb8e4..662d3c4 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -19,10 +19,13 @@
//������������id������������������
List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
- //������mac������������������
- Map<String, Object> getSensorsByMac(String mac);
+ //������macs������������������������
+ Map<String, Object> getSensorsByMac(Map<String,Object> params);
//���������������������������������
List<Map<String, Object>> getTrendChartData(Map<String,Object> params);
+ //������mac������������������
+ Device getDeviceByMac(String mac);
+
}
--
Gitblit v1.8.0