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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

 screen-api/src/main/java/com/moral/api/pojo/vo/file/FileVo.java

@@ -23,4 +23,7 @@

    @ApiModelProperty(value = "文件名称")
    private String fileName;

    @ApiModelProperty(value = "类型1图片")
    private Integer fileType;
}