diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index d8e139970..e9e5db819 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -63,6 +63,28 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value = "店铺列表", name = "shopVoList") private List shopVoList; + @io.swagger.annotations.ApiModelProperty(value = "品牌名称", name = "brandName") + private String brandName; + + @io.swagger.annotations.ApiModelProperty(value = "品牌图", name = "brandImg") + private String brandImg; + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + public String getBrandImg() { + return brandImg; + } + + public void setBrandImg(String brandImg) { + this.brandImg = brandImg; + } + public List getShopVoList() { return shopVoList; } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 730a826b2..087fd9ab5 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -116,7 +116,7 @@ m.id, m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, - m.is_public,m.email,m.title,m.cover_picture + m.is_public,m.email,m.title,m.cover_picture,b.name as brand_name,b.logo as brand_img