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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

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

@@ -92,6 +92,7 @@
        vo.setUpper(sensor.getUpper());
        vo.setLower(sensor.getLower());
        vo.setUnitKey(sensor.getUnitKey());
        vo.setCode(sensor.getCode());
        return vo;
    }
}