From 145ad6d266443a1200cc155c72d28dd3b94697b1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 11 Apr 2019 14:04:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E8=AF=A6=E6=83=85][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=98=8E=E7=BB=86=E6=98=BE=E7=A4=BA=E5=A4=9A?= =?UTF-8?q?=E5=95=86=E9=93=BA=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 | 13 ++++++++ .../mapper/WxCouponMerchantMapper.xml | 33 +++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) 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 c56975f31..a64362f39 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -1,6 +1,8 @@ package com.iformall.domain.vo; import javax.persistence.Id; +import java.util.List; + public class WxMerchantVo { private static final long serialVersionUID = 6687964942922444531L; @@ -56,6 +58,17 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") private Integer isPublic; + @io.swagger.annotations.ApiModelProperty(value = "店铺列表", name = "shopVoList") + private List shopVoList; + + public List getShopVoList() { + return shopVoList; + } + + public void setShopVoList(List shopVoList) { + this.shopVoList = shopVoList; + } + public Integer getIsPublic() { return isPublic; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index cca006362..5c67b05db 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -63,10 +63,7 @@ - m.id, - m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, - s.addr,s.shop_number,s.baidu_poi, - mb.building_name,mf.floor_name, + m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id,m.sub_business_id, cm.parameter @@ -79,23 +76,39 @@ - + + + + + + + + - + + +