From 0ba1a0b7a8528d78aa5180fc76bb4975b0da2a47 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 25 Jun 2025 16:03:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29

---
 src/main/java/com/nq/dao/UserStockSubscribeMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/dao/UserStockSubscribeMapper.java b/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
index f539dec..5ba9b16 100644
--- a/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
+++ b/src/main/java/com/nq/dao/UserStockSubscribeMapper.java
@@ -51,7 +51,7 @@
      * @author lr
      * @date 2020/09/11
      **/
-    List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId,@Param("agentId") String name,@Param("agentId") Integer status);
+    List<UserStockSubscribe> pageList(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("keyword") String keyword,@Param("agentId") String agentId,@Param("name") String name,@Param("status") Integer status);
 
     /**
      * [查询] 分页查询 count

--
Gitblit v1.9.3