Merge remote-tracking branch 'origin/master'

lb-module/src/main/resources/mapper/module/shopMapper.xml

@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where deleted = 0 and status = 1
         and merchant_id = #{params.merchantId}
         <if test="params.memberType == 3 and params.shopId != null">
-            and id = #{shopId}
+            and id = #{params.shopId}
         </if>
     </select>
 

lb-module/src/main/resources/mapper/module/shopWaimaiMapper.xml

@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.id as shopId,
         s.merchant_id as merchantId,
         w.id,
+        w.business_id businessId,
         w.bind_status as bindStatus
         FROM
         lb_shop_waimai w