| @@ -129,7 +129,7 @@ public class WxMerchant implements Serializable { | |||||
| private Integer shopType; | private Integer shopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") | @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") | ||||
| private String brand; | |||||
| private Long brand; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") | @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") | ||||
| private Integer vipDiscountRate1; | private Integer vipDiscountRate1; | ||||
| @@ -328,11 +328,11 @@ public class WxMerchant implements Serializable { | |||||
| this.shopType = shopType; | this.shopType = shopType; | ||||
| } | } | ||||
| public String getBrand() { | |||||
| public Long getBrand() { | |||||
| return brand; | return brand; | ||||
| } | } | ||||
| public void setBrand(String brand) { | |||||
| public void setBrand(Long brand) { | |||||
| this.brand = brand; | this.brand = brand; | ||||
| } | } | ||||