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