Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-24 39af4d876bc4a6501b3d12a29efbdca490fe3ee2

 src/components/FileUpload/index.vue

@@ -63,7 +63,7 @@
    // 文件类型, 例如['png', 'jpg', 'jpeg']
    fileType: {
      type: Array,
      default: () => ["doc", "xls", "ppt", "txt", "pdf","png","jpg"],
      default: () => ["docx", "xlsx", "ppt", "txt", "pdf","png","jpg"],
    },
    // 是否显示提示
    isShowTip: {