Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RoleController.java

@@ -65,6 +65,7 @@
    public R<IPage<Role>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(roleService.lambdaQuery().eq(Role::getDelFlag, 0)
                        .ne(Role::getRoleName,"加盟商")
                .orderByDesc(Role::getCreateTime).page(Page.of(pageNum, pageSize)));
    }