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

ZhuDongming

2019-09-02 e8ef361dc975aeaedeee6f28dfe679489a22f9d5

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

@@ -31,4 +31,6 @@
    List<Map<String,Object>> getSensorByDeviceId(String id);
    
    List<Map<String,Object>> getSensorByMonitorPointId(String monitor_point_id);

    Map<String, String> getSensorsMap(Map<String, Object> parameters) throws Exception;
}