From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 8 ++++++--
1 files changed, 6 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 fdb62f1..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
@@ -87,8 +87,12 @@
Map<String,Object> detail(String mac,String startTime,String endTime, String type);
-
- Map<String,Object> getStart(Integer organizationId);
+ /**
+ * ���������������
+ * @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