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

peng

4 天以前 09310a5a6da2ffccc17f460244fb9a09ec3ff68b

 framework/src/main/java/cn/lili/modules/lmk/domain/form/FileInfoForm.java

@@ -28,4 +28,8 @@
    @ApiModelProperty("文件原始名")
    private String originalFileName;

    private String url;

    private String cover;

}