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

peng

8 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 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;

}