Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-06 9b02f67b17b9dcbd798862021ac0a516d1ba69b3

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

@@ -15,4 +15,13 @@
    void remove(Integer id);

    Map<Integer,List<SensorUnit>> queryGroupSensorBySids(List<Integer> sensorIds);
    
    Map<String, Object> getSensorByMac(String mac);
    
    //Map<String, Object> getSensorsByMonitPointId(String id);
    
    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
    
    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
    
}