Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 42cce7d9a859083818a0e10eb3b6c80385042e47

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -150,7 +150,7 @@
    public void exportUser(HttpServletResponse response) {
        List<UmsUserDto1> umsUserDtos = adminService.userExp();
        String sheetName = "用户导出";
        EasyExcelUtils.export(response, sheetName, UmsUserDto1.class, umsUserDtos);
        EasyExcelUtils.export1(response, sheetName, UmsUserDto1.class, umsUserDtos, "用户导出");
    }

    @Resource