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

whycq

2022-11-01 bcefacbe2e7a5c375b38c70065985498a3e0e3fe

 src/main/java/com/zy/common/web/AuthController.java

@@ -394,7 +394,7 @@
        }
        List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
        List<Permission> permissions = permissionService.selectBatchIds(collect);
        return R.ok().add(permissions.stream().map(Permission::getAction).distinct().collect(Collectors.toList()));
        return R.ok().add(permissions);
    }

}