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

cjl

2023-09-28 bcc3e41bdd1865c288f7d570ce4da1d5cea32462

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