From 95705a20be29c2b6b79640ab06306b1775acc4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Sun, 7 Apr 2024 19:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=B4=A2=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/LineInfoMapper.xml               | 2 +-
 .../src/main/java/com/cool/store/request/PartnerRequest.java   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 910214dae..4f5f6a603 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -381,7 +381,7 @@
       and a.investment_manager = #{userId}
     </if>
     <if test="request.keyword != null and request.keyword!=''">
-      and (a.username like #{request.userName} or a.mobile like #{request.mobile})
+      and (a.username like #{request.keyword} or a.mobile like #{request.keyword})
     </if>
     <if test="wantShopAreaName != null">
       and b.area_path like concat('%',#{wantShopAreaName},'%')
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerRequest.java
index 4b8152f19..050ee037e 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerRequest.java
@@ -12,6 +12,9 @@ import lombok.Data;
 @Data
 public class PartnerRequest extends PageBasicInfo {
 
+
+    @ApiModelProperty("加密状态 1-蓄水池 2-正式")
+    private Integer joinStatus;
     @ApiModelProperty("加盟上姓名或者手机号")
     private String keyword;
     @ApiModelProperty("线索子阶段")