多品牌使用

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

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;
 }

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;
 
 }

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;
 
 }