From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/mapper/HistoryMapper.java b/src/main/java/com/moral/mapper/HistoryMapper.java
index 5f81619..4b5a131 100644
--- a/src/main/java/com/moral/mapper/HistoryMapper.java
+++ b/src/main/java/com/moral/mapper/HistoryMapper.java
@@ -15,5 +15,7 @@
 	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);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0