Merge remote-tracking branch 'origin/master'

mitao

昨天 f1e1ea5b322c4840711afbc7e069b4c280742807

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

@@ -442,12 +442,17 @@
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("员工信息导入模板.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setHeader("content-Type", "application/vnd.ms-excel");
            response.reset();
            response.setCharacterEncoding("utf-8");
            response.setContentType("application/vnd.ms-excel;charset=utf-8");
            // 兼容各种浏览器文件名
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ";filename*=utf-8''" + fileName);
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
            outputStream.flush();
            workbook.close();
        } catch (IOException e) {
            e.printStackTrace();
            System.out.println("员工导入模板下载失败!");