From b97887d232f865b6a4bf835861aac8a4ebc55c28 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 03 Jul 2018 14:10:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/HistoryMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 66ff879..5f81619 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -12,7 +12,7 @@
 
 	List<Map<String, Object>> getRegionRankingData(Map<String, Object> parameters);
 
-	List<Map<String, Object>> selectNextLevelRegion(Map<String, Object> parameters);
+	List<String> selectNextLevelRegion(Map<String, Object> parameters);
 
 	List<Map<String, Object>> getDischargeByRegion(Map<String, Object> parameters);
 

--
Gitblit v1.8.0