From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/DeviceMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/DeviceMapper.java b/src/main/java/com/moral/mapper/DeviceMapper.java
index 852b972..b77c595 100644
--- a/src/main/java/com/moral/mapper/DeviceMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceMapper.java
@@ -24,5 +24,7 @@
 	Device selectWithOrgIdsByMac(String mac);
 	
 	List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);
-	
+
+	Integer getDeviceCountByRegion(Map<String, Object> parameters);
+
 }
\ No newline at end of file

--
Gitblit v1.8.0