From 315ec391b2a36a6d796a8726b57b7c2b8908db12 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into qa
---
screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
index 2572c8d..d107d5c 100644
--- a/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
+++ b/screen-api/src/main/java/com/moral/api/service/HistoryFiveMinutelyService.java
@@ -47,6 +47,6 @@
* @Author: ���������
* @Date: 2022/3/10
*/
- Map<String,Object> getPopDataByMac(String mac);
+ Map<String,Object> getPopDataByMac(Map<String, Object> params);
}
--
Gitblit v1.8.0