Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-24 eb51b2364e9a3fbe806fde61fa255660a098fc8b

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

@@ -87,9 +87,12 @@
    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());
        vo.setCode(sensor.getCode());
        return vo;
    }
}