From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/mapper/HistoryHourlyMapper.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
index 9f684d6..2bdc6c9 100644
--- a/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryHourlyMapper.java
@@ -5,4 +5,8 @@
public interface HistoryHourlyMapper {
Map<String, Object> getPollutionSourceData(Map<String, Object> parameters);
+
+ Map<String, Object> getPollutionSourceDataByHour(Map<String, Object> parameters);
+
+ Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters);
}
--
Gitblit v1.8.0