From b1bfa089b5b299c1c3c71094e450748a5e5e8a75 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Aug 2023 15:35:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb_21' into dev
---
screen-job/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 dd466df..2e8f41b 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
@@ -7,5 +7,7 @@
void createTable(String timeUnits);
- List<Map<String, Object>> getHistoryFiveMinutelyData(Map<String,Object> params);
+ List<Map<String, Object>> getHistoryMinutelyData(Map<String, Object> params);
+
+ List<Map<String, Object>> getHourlyData(Map<String, Object> params);
}
--
Gitblit v1.8.0