Merge branch 'master' of http://61.139.16.27:26684/maojiacai/ba_web

src/components/MyComponents/Upload/index.vue

@@ -148,7 +148,7 @@ watch(() => props.modelValue,(val) => {
     if (arr.length > 0) {
       fileList.value = arr.map((el) => {
         if (Object.prototype.toString.call(el) === "[object Object]") {
-          return { url: `/mosty-base/minio/image/download/` + el, name: el.name};
+          return props.isAll ? { url: `/mosty-base/minio/image/download/` + el.id, name: el.name } : { url:el,name:el.name};
         } else {
           return { url: `/mosty-base/minio/image/download/` + el };
         }