From 5c1d58556e9cd4c7603b5e16dc1640f61623af0b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 08 Nov 2023 11:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java b/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
index 2e8f41b..f2798fc 100644
--- a/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
+++ b/screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
@@ -9,5 +9,7 @@
List<Map<String, Object>> getHistoryMinutelyData(Map<String, Object> params);
+ List<String> getHistoryMinutelyMacData(Map<String, Object> params);
+
List<Map<String, Object>> getHourlyData(Map<String, Object> params);
}
--
Gitblit v1.8.0