From ad906eadca9d459f7702ae0ca5755cd63a7d05b6 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 5 Nov 2024 13:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=93=81=E7=89=8C=E4=BD=BF=E7=94=A8?=
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/entity/LineInfoDO.java        | 2 +-
 .../main/java/com/cool/store/request/UpdateLineRequest.java    | 3 ++-
 .../src/main/java/com/cool/store/vo/LineInfoVO.java            | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
index 5bf9a7358..8d4ff6b38 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
@@ -32,7 +32,7 @@
     <result column="deleted" jdbcType="BIT" property="deleted" />
     <result column="partner_num" jdbcType="VARCHAR" property="partnerNum" />
     <result column="big_region_id" jdbcType="BIGINT" property="bigRegionId" />
-    <result column="franchise_brand" jdbcType="TINYINT" property="franchiseBrand" />
+    <result column="franchise_brand" jdbcType="VARCHAR" property="franchiseBrand" />
   </resultMap>
     <insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id">
       INSERT INTO xfsg_line_info
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
index dcb89ba14..ff2703d92 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
@@ -176,5 +176,5 @@ public class LineInfoDO {
     @Column(name = "join_mode")
     private Integer joinMode;
     @Column(name = "franchise_brand")
-    private Integer franchiseBrand;
+    private String franchiseBrand;
 }
\ No newline at end of file
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java
index 2212bf35e..684e4535f 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -30,6 +31,6 @@ public class UpdateLineRequest {
     private Integer joinMode;
     @NotNull
     @ApiModelProperty("加盟品牌")
-    private Integer franchiseBrand;
+    private String franchiseBrand;
 
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
index 781023e2a..f9f619ec3 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
@@ -228,6 +228,6 @@ public class LineInfoVO {
 
     private Long bigRegionId;
 
-    private Integer franchiseBrand;
+    private String franchiseBrand;
 
 }