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

ZhuDongming

2019-07-31 33ca0da19b3f87751662de0072c48ce9ce963202

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

@@ -27,4 +27,8 @@
    public List<Sensor> getAllSensors();
    
    Map<String, Object> getSensorBySensorKey(String SensorKey);
    
    List<Map<String,Object>> getSensorByDeviceId(String id);
    
    List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);
}