From 54c0125835e850b97793601ac45ee62fa1c4b12e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 09:36:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java |    4 ++++
 1 files changed, 4 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 ab354d9..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
@@ -8,4 +8,8 @@
     void createTable(String timeUnits);
 
     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