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

peng

3 天以前 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e

 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;

}