From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
index dc6b12b..12d53bf 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
+++ b/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();

--
Gitblit v1.9.3