From bfae0be9c3980b6ec09f86bcb543bb8960927e14 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 13 Jul 2023 08:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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