Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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