Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

yuan

2 天以前 eecd51db2f0e1094650206fa534dd02f5de58c9c

 src/components/AttachmentUpload/file/index.vue

@@ -17,7 +17,7 @@
  },
  limit: {
    type: Number,
    default: 20,
    default: 10,
  },
  fileSize: {
    type: Number,