suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多品牌使用

Browse Source
This commit is contained in:
shuo.wang
2024-11-05 13:44:01 +08:00
parent f71d969744
commit ad906eadca
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -32,7 +32,7 @@
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
<result column="partner_num" jdbcType="VARCHAR" property="partnerNum" /> <result column="partner_num" jdbcType="VARCHAR" property="partnerNum" />
<result column="big_region_id" jdbcType="BIGINT" property="bigRegionId" /> <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> </resultMap>
<insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id"> <insert id="insertOrUpdate" parameterType="com.cool.store.entity.LineInfoDO" useGeneratedKeys="true" keyProperty="id">
INSERT INTO xfsg_line_info INSERT INTO xfsg_line_info

2
coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
View File

@@ -176,5 +176,5 @@ public class LineInfoDO {
@Column(name = "join_mode") @Column(name = "join_mode")
private Integer joinMode; private Integer joinMode;
@Column(name = "franchise_brand") @Column(name = "franchise_brand")
private Integer franchiseBrand; private String franchiseBrand;
} }

3
coolstore-partner-model/src/main/java/com/cool/store/request/UpdateLineRequest.java
View File

@@ -6,6 +6,7 @@ import lombok.Data;
import javax.validation.constraints.Max; import javax.validation.constraints.Max;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* @Author suzhuhong * @Author suzhuhong
@@ -30,6 +31,6 @@ public class UpdateLineRequest {
private Integer joinMode; private Integer joinMode;
@NotNull @NotNull
@ApiModelProperty("加盟品牌") @ApiModelProperty("加盟品牌")
private Integer franchiseBrand; private String franchiseBrand;
} }

2
coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
View File

@@ -228,6 +228,6 @@ public class LineInfoVO {
private Long bigRegionId; private Long bigRegionId;
private Integer franchiseBrand; private String franchiseBrand;
} }