From d4492f880100e8a5e62153a18bc394ed5306c619 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 17 Apr 2019 12:02:14 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E5=95=86=E6=88=B7][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=98=BE=E7=A4=BA=E5=93=81=E7=89=8C=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxMerchantVo.java | 22 +++++++++++++++++++ .../resources/mapper/WxMerchantMapper.xml | 6 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) 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