From 4e1f0c4d5becc134a723be800184d8c7b12c5a4f Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 14 Dec 2018 20:23:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 cc49f8376..77f605e48 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -129,7 +129,7 @@ public class WxMerchant implements Serializable { private Integer shopType; @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") - private String brand; + private Long brand; @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") private Integer vipDiscountRate1; @@ -328,11 +328,11 @@ public class WxMerchant implements Serializable { this.shopType = shopType; } - public String getBrand() { + public Long getBrand() { return brand; } - public void setBrand(String brand) { + public void setBrand(Long brand) { this.brand = brand; }