From ca0af74762cf0e87691edf23c308c1424bbebb48 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 19 Sep 2019 17:25:59 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E6=96=B0=E5=A2=9E]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A5=BC=E5=B1=82=E6=A5=BC=E5=BA=A7=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=95=86=E6=88=B7=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxMerchantVo.java | 5 +++-- .../src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 2 files changed, 4 insertions(+), 3 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 1e4bf9a59..3233ee49f 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,7 @@ package com.iformall.domain.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.models.auth.In; import lombok.Data; import java.util.List; @@ -41,10 +42,10 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") - private Long building; + private Integer building; @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") - private Long floor; + private Integer floor; @io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show") diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 7020e4f88..cebafdc5e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -273,7 +273,7 @@ - m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, + distinct m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id, m.shop_type,m.introduction,m.action_desc,bu.title as business_name,m.link_line_phone