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/WeatherService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/WeatherService.java b/src/main/java/com/moral/service/WeatherService.java
index dab9c27..6598b96 100644
--- a/src/main/java/com/moral/service/WeatherService.java
+++ b/src/main/java/com/moral/service/WeatherService.java
@@ -1,9 +1,12 @@
package com.moral.service;
+import java.util.List;
import java.util.Map;
public interface WeatherService {
Map<String, Object> getWeatherDataByRegion(Map<String, Object> parameters);
+
+ Map<String, Object> get15DayWeatherDataByRegion(Map<String, Object> parameters);
}
--
Gitblit v1.8.0