Merge remote-tracking branch 'origin/master'

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/bean/FileConfig.java

@@ -22,22 +22,12 @@ public class FileConfig {
      * 允许的上传文件后缀类型
      */
     private Set<String> allowedFileExtensionName = Sets.newHashSet(
-            "txt",
+            "jpg", "jpeg", "png", "gif", "bmp", "svg", "webp", "ico",
-            "pdf",
+            "xls", "xlsx", "csv",
-            "xls",
+            "ppt", "pptx",
-            "xlsx",
+            "doc", "docx",
-            "csv",
+            "txt", "pdf",
-            "doc",
+            "mp4", "mov", "mp3",
-            "docx",
+            "rar", "zip"
-            "png",
-            "jpg",
-            "gif",
-            "mp4",
-            "mov",
-            "mp3",
-            "rar",
-            "zip",
-            "ppt",
-            "svg"
     );
 }