Merge remote-tracking branch 'origin/master'

疯狂的狮子li

2021-03-15 46aa17db9cc277c821c46c82650e7e3cbda97004

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

@@ -90,6 +90,7 @@
          return item;

        });

      } else {

        this.fileList = [];

        return [];

      }

    },