Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -29,6 +29,8 @@

    List<Map<String, Object>> getSensorByDeviceId(String id);

    List<Map<String, Object>> getSensorByDId(String id);

    List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id);

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