Merge branch 'master' of https://github.com/zhitan-cloud/zhitan-ems

ustcyc

2025-04-18 12ea7330bac0a43818b8ec3a8601119dd609dfb9

 zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java

@@ -433,6 +433,7 @@
                    DateUtils.parseDate(role.getParams().get("beginTime")),
                    DateUtils.parseDate(role.getParams().get("endTime")));
        }
        queryWrapper.eq(SysRole::getDelFlag, 0);
        return roleMapper.selectPage(new Page<SysRole>(pageNum,pageSize),queryWrapper);
    }