From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
index 18498ae..4a2f53a 100644
--- a/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java
@@ -31,13 +31,8 @@
             */
     SpecialDevice getSpecialDeviceMapByMac(String mac);
 
-    /**
-    * @Description: ������mac������������������������
-            * @Param: [mac]
-            * @return: com.moral.api.entity.SpecialDevice
-            * @Author: ���������
-            * @Date: 2021/9/8
-            */
-    SpecialDevice getSpecialDeviceByMac(String mac);
+
+    //���������������������������������������
+    List<String> getDatesByMac(String mac);
 
 }

--
Gitblit v1.8.0