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

ZhuDongming

2019-08-29 ef3a45a366ea8451f2581547fa6a3894bd1d672f

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

@@ -14,4 +14,6 @@
   
   List<Map<String, Object>> getSensorsByMonitPointId(@Param("id")String id);
   
   List<Map<String, Object>> getSensorUnitByDeviceMac(Map<String, Object> parameters);
	
}