Merge branch 'master' into develop1.0

VVT789

2025-03-21 96ac6b26f4f3c241def2f35d5100027784901cf5

 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);
    }