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/user/UserController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
index 953c1a1..7b6e5ad 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
@@ -85,7 +85,7 @@
}
Page<UserDto> page = new Page(model.getCurrent(), model.getSize());
userService.listUser(page, roleNames, model.getUserCode(), model.getUserName(), model.getUserMail(), model.getUserMobile(),
- permissionFacade.getOwnerUserIds());
+ permissionFacade.getOwnerUserIds(), model.getRecomUserName());
return Result.ok(page);
}
--
Gitblit v1.9.3