From 1097d9b75533cd4686bc24cb06ed98010fcfcecf Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 29 Aug 2018 14:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 3afddc2..134ed98 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -12,6 +12,12 @@
 
 	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);
+	
+	List<Map<String, Object>> getValueByMacAndSize(Map<String, Object> parameters);
+
+	Map<String, Object> getActualDataByRegion(Map<String, Object> parameters);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0