Merge branch 'develop1.0' into zt_from_develop1.0

zt916916

2025-03-20 622e2b900a43fb6658e4d46cd376cd99e9633ab1

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