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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

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