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

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-ui/src/components/FileUpload/index.vue

@@ -148,7 +148,7 @@
    handleUploadSuccess(res, file) {
      if (res.code === 200) {
        this.$message.success("上传成功");
        this.fileList.push({ name: res.data.fileName, url: res.data.fileName });
        this.fileList.push({ name: res.data.fileName, url: res.data.url });
        this.$emit("input", this.listToString(this.fileList));
      } else {
        this.$message.error(res.msg);