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