Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2021-10-25 42a3117e2ac087f5c2c28ca07a1c4443e2c38ca3

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java

@@ -98,8 +98,6 @@
            throw new ServiceException("文件数据不存在!");
        }
        response.reset();
        response.addHeader("Access-Control-Allow-Origin", "*");
        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
        FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
        long data;