Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 src/main/java/com/moral/service/SensorUnitService.java

@@ -18,6 +18,10 @@
    
    Map<String, Object> getSensorByMac(String mac);
    
    Map<String, Object> getSensorsByMonitPointId(String id);
    //Map<String, Object> getSensorsByMonitPointId(String id);
    
    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
    
    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
    
}