|
|
|
@@ -50,9 +50,19 @@ public class WxPropertyContract implements Serializable { |
|
|
|
public void setShopNumber(String shopNumber) { |
|
|
|
this.shopNumber = shopNumber; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/*商户**/ |
|
|
|
|
|
|
|
@Transient |
|
|
|
private String brandName; |
|
|
|
|
|
|
|
public String getBrandName() { |
|
|
|
return brandName; |
|
|
|
} |
|
|
|
|
|
|
|
public void setBrandName(String brandName) { |
|
|
|
this.brandName = brandName; |
|
|
|
} |
|
|
|
|
|
|
|
/*商户**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") |
|
|
|
private Long merchantId; |
|
|
|
/*月租金/分成(分)**/ |
|
|
|
@@ -96,7 +106,7 @@ public class WxPropertyContract implements Serializable { |
|
|
|
private String merchantName; |
|
|
|
/*经营品牌**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="经营品牌",name="brand") |
|
|
|
private String brand; |
|
|
|
private Long brand; |
|
|
|
/*经营业态ID:参照wx_business表**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") |
|
|
|
private Integer businessId; |
|
|
|
@@ -224,10 +234,10 @@ public class WxPropertyContract implements Serializable { |
|
|
|
public void setMerchantName(String _merchantName) { |
|
|
|
merchantName = _merchantName; |
|
|
|
} |
|
|
|
public String getBrand() { |
|
|
|
public Long getBrand() { |
|
|
|
return brand; |
|
|
|
} |
|
|
|
public void setBrand(String _brand) { |
|
|
|
public void setBrand(Long _brand) { |
|
|
|
brand = _brand; |
|
|
|
} |
|
|
|
public Integer getBusinessId() { |
|
|
|
|