diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 46bbb3da3..c58ffc0ce 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -233,7 +233,7 @@ public class WxPropertyContractController extends WxContractBaseController { wxPropertyContract.setShopType(merchant.getShopType()); wxPropertyContract.setLinkPerson(merchant.getLinkPerson()); wxPropertyContract.setLinkPhone(merchant.getLinkPhone()); - wxPropertyContract.setRentShopType(merchant.getRentShopType()); + wxPropertyContract.setRentShopType(merchant.getType()); Integer contractType = wxRentPropertyContractService.getContractType(wxPropertyContract.getRentShopType(), wxPropertyContract.getOperationType(), EnumContractType.PROPERTY.getCode()); wxPropertyContract.setContractType(contractType); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 6093c3b2a..939bfa3b8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -282,7 +282,7 @@ public class WxMerchant extends TenantEntity { private Integer shopType; @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") private Long brand; - @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") + @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") private Integer type; @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") private String email;