From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/service/DeviceService.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 0e18dd2..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
@@ -25,4 +25,7 @@
     //���������������������������������
     List<Map<String, Object>> getTrendChartData(Map<String,Object> params);
 
+    //������mac������������������
+    Device getDeviceByMac(String mac);
+
 }

--
Gitblit v1.8.0