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

cjl

2023-07-13 bfae0be9c3980b6ec09f86bcb543bb8960927e14

 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;
    }
}