Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-13 d4f150414533b95324b2a1c8a81c11d92efb71ec

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

@@ -22,4 +22,7 @@
   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);

	
}