Merge remote-tracking branch 'origin/master'

zyy3

2025-12-02 b967bac24b2fd662ac3b8826700fb76c26690aec

 trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java

@@ -124,7 +124,7 @@
        roleNames.add(Constants.SECURITY_ROLE_MEMBER);
        roleNames.add(Constants.SECURITY_ROLE_TEST);

        userService.listUser(page, roleNames, null, null, null,null, childs);
        userService.listUser(page, roleNames, null, null, null,null, childs, null);
        List<AgentDto> agentDtos = new ArrayList<>();
        for (UserDto userDto : page.getRecords()) {
            AgentDto agentDto = new AgentDto();