Merge remote-tracking branch 'origin/dev' into dev

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java

@@ -87,9 +87,11 @@
    private static SensorVO convertToSensorVO(Sensor sensor) {
        SensorVO vo = new SensorVO();
        vo.setName(sensor.getName());
        vo.setCode(sensor.getCode());
        vo.setId(sensor.getId());
        vo.setUnit(sensor.getUnit());
        vo.getUnitKey();
        vo.setUpper(sensor.getUpper());
        vo.setLower(sensor.getLower());
        vo.setUnitKey(sensor.getUnitKey());
        return vo;
    }
}