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

gaoluyang

6 天以前 00ef76a2e286e338fa3c648ce183e3533ce006ad

 src/components/ImageUpload/index.vue

@@ -57,7 +57,7 @@
  // 上传接口地址
  action: {
    type: String,
    default: "/common/upload"
    default: "/common/minioUploads"
  },
  // 上传携带的参数
  data: {