From 57f903e0eb21bd66c88ebc00ccc9d30b49d36f3e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 03 Aug 2023 13:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' 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