Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

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