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-service/src/main/java/com/yami/trading/dao/user/UserMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
index 8b9ceb5..f69faf0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
@@ -28,7 +28,7 @@
 
 	Page<UserDto> listUser(Page page,@Param("roleNames")  List<String> roleNames, @Param("userCode") String userCode,
 						   @Param("userName") String userName,  @Param("userMail") String userMail,  @Param("userMobile") String userMobile,
-						   @Param("checkedList") List<String> checkedList);
+						   @Param("checkedList") List<String> checkedList, @Param("recomUserName") String recomUserName);
 
    Page<UserDataDto> listUserAndRecom(Page page,@Param("roleNames")  List<String> roleNames, @Param("userCode") String userCode,@Param("userName")   String userName,
 									  @Param("lastIp")   String lastIp,@Param("checkedList") List<String> checkedList,

--
Gitblit v1.9.3