From 306b1433c6a4d1fcce6871d94dc47af8e6f550cc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 30 五月 2024 15:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/UploadC.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/components/UploadC.vue b/src/components/UploadC.vue
index 3a8df6e..0e8fe0d 100644
--- a/src/components/UploadC.vue
+++ b/src/components/UploadC.vue
@@ -43,8 +43,9 @@
       uploadUrl: "http://localhost:8085/api/upload/upload",
       fileTypeList: {
         'video': ['mp4', 'avi'],
-        'img': ['jgp', 'png', 'jpeg'],
+        'img': ['jpg', 'png', 'jpeg'],
         'pdf': ['pdf'],
+        'file': ['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'png', 'jpg', 'jpeg', 'pdf'],
       }
     };
   },

--
Gitblit v1.8.0