Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-20 6688e50ba02988d742baadaca156a303a90b6191

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -22,4 +22,9 @@
   List<Device> selectByOrgIdAndMpId(@Param("orgId")Integer orgId,@Param("mpId")Integer mpId);

   List<Device> selectByMap(Map<String, Object> params);

   Device selectWithOrgIdsByMac(String mac);

	
   List<Integer> getDeviceVersionIdByAreaCode(Map<String, Object> parameters);



   Integer getDeviceCountByRegion(Map<String, Object> parameters);



}