Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力

liu

3 天以前 5f612ab2f67b2c6f6894c624a7780799526d566d

 yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/attendance/HrmAttendanceHolidayController.java

@@ -101,7 +101,7 @@
                        .type(1).isLegal(1).remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "节假日配置导入模板.xls", "节假日配置列表", HrmAttendanceHolidayImportExcelVO.class, list);
        ExcelUtils.writeTemplate(response, "节假日配置导入模板.xls", "节假日配置列表", HrmAttendanceHolidayImportExcelVO.class, list);
    }

    @PostMapping("/import")