Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-08-12 a332264920c9cd9226d566c19e36e5d5b5549c1b

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