diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index abffd3770..255cadae7 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -30,11 +30,11 @@ - + - + - + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java index ba24c2c91..a289f4f1f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java @@ -136,17 +136,17 @@ public class ShopInfoDO { private String province; //省code @Column(name = "province_code") - private String provinceCode; + private Integer provinceCode; //市 @Column(name = "city") private String city; //市code @Column(name = "city_code") - private String cityCode; + private Integer cityCode; //区 @Column(name = "district") private String district; //区code @Column(name = "district_code") - private String districtCode; + private Integer districtCode; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java index 4b2e7fadd..41f655491 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java @@ -125,24 +125,21 @@ public class AddSignFranchiseRequest { private String province; //省code @ApiModelProperty("省code") - @NotBlank(message = "省code不能为空") - private String provinceCode; + private Integer provinceCode; //市 @ApiModelProperty("市") @NotBlank(message = "市不能为空") private String city; //市code @ApiModelProperty("市code") - @NotBlank(message = "市code不能为空") - private String cityCode; + private Integer cityCode; //区 @ApiModelProperty("区") @NotBlank(message = "区不能为空") private String district; //区code @ApiModelProperty("区code") - @NotBlank(message = "区code不能为空") - private String districtCode; + private Integer districtCode; public SignFranchiseDO toSignFranchiseDO() { diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index f829bdfff..09edac9b4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -217,19 +217,19 @@ public class AddSignFranchiseResponse { private String province; //省code @ApiModelProperty("省code") - private String provinceCode; + private Integer provinceCode; //市 @ApiModelProperty("市") private String city; //市code @ApiModelProperty("市code") - private String cityCode; + private Integer cityCode; //区 @ApiModelProperty("区") private String district; //区code @ApiModelProperty("区code") - private String districtCode; + private Integer districtCode; }