From 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 18 Apr 2024 14:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 11 +++++++++++
1 files changed, 11 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 c6ff674..b5b3bd8 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
@@ -85,4 +85,15 @@
* @return
*/
Map<String,Object> detail(String mac,String startTime,String endTime, String type);
+
+
+ /**
+ * ���������������
+ * @param macs
+ * @return
+ */
+ Map<String,Object> getStart(List<String> macs);
+
+
+ Map<String,Object> detailV1(String mac,String startTime,String endTime, String type);
}
--
Gitblit v1.8.0