Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

 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);



}