Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-10 c8cc61e84189d8f986f7c4657d543408021b3da0

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