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 ad7ff0dcf..1e4bf9a59 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java
@@ -39,6 +39,14 @@ public class WxMerchantVo {
@io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName")
private String floorName;
+
+ @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
+ private Long building;
+
+ @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor")
+ private Long floor;
+
+
@io.swagger.annotations.ApiModelProperty(value = "是否显示在C端", name = "show")
private Integer isPublic;
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index f60055550..7020e4f88 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -332,6 +332,16 @@
select
FROM wx_merchant m
+
+ join wx_merchant_shop ms on ms.merchant_id=m.id
+ join wx_shop s on ms.shop_id=s.id
+
+ and s.building = #{building}
+
+
+ and s.floor = #{floor}
+
+
left join wx_business bu on bu.id = m.business_id
where 1=1 and m.is_del=0