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/service/HistoryHourlyService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/HistoryHourlyService.java b/src/main/java/com/moral/service/HistoryHourlyService.java
index 71286d2..e6ca84a 100644
--- a/src/main/java/com/moral/service/HistoryHourlyService.java
+++ b/src/main/java/com/moral/service/HistoryHourlyService.java
@@ -7,5 +7,9 @@
 public interface HistoryHourlyService {
     Map<String, Object> getPollutionSourceData(Map<String, Object> parameters) throws Exception;
 
+    Map<String, Object> getPollutionSourceDataByHour(Map<String, Object> parameters) throws Exception;
+
+    Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters) throws Exception;
+
     Point getDirPoint(Map<String, Object> parameters) throws Exception;
 }

--
Gitblit v1.8.0