From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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