Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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