Merge remote-tracking branch 'origin/master'

hx-file/src/main/java/com/fjhx/file/entity/ObsFile.java

@@ -17,4 +17,7 @@ public class ObsFile {
      */
     private String fileName;
 
+    /**文件大小*/
+    private String fileSize;
+
 }