From 82841afc4e140f72fdeb378102e0e9a978bbe14c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:26:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/SpecialDeviceService.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 6d3705e..ae500b4 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
@@ -29,16 +29,11 @@
* @Author: ���������
* @Date: 2021/9/8
*/
- Map<String,Object> getSpecialDeviceMapByMac(String mac);
+ 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);
//���������������������������������������
List<String> getDatesByMac(String mac);
--
Gitblit v1.8.0