From 1259bce460f41ef166e4bb25a81690bcfd457e1b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 03 四月 2024 11:43:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index c7f6b0a..1e8728c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -60,7 +60,7 @@
     // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf","png","jpg"],
     },
     // 鏄惁鏄剧ず鎻愮ず
     isShowTip: {

--
Gitblit v1.8.0