Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
ff3dc01c4f
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java View File

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


Loading…
Cancel
Save