Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/service/impl/SensorServiceImpl.java

@@ -118,6 +118,11 @@
    }

    @Override
    public List<Map<String, Object>> getSensorByDId(String id) {
        List<Map<String, Object>> list = sensorMapper.getSensorByDId(id);
        return list;
    }
    @Override
    public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) {
        List<Map<String, Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id);
        return list;