|
|
@@ -128,7 +128,6 @@ |
|
|
select |
|
|
select |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
FROM wx_merchant m |
|
|
FROM wx_merchant m |
|
|
left join wx_merchant_shop ms on ms.merchant_id = m.id |
|
|
|
|
|
left join wx_brand b on b.id = m.brand |
|
|
left join wx_brand b on b.id = m.brand |
|
|
left join wx_business bu on b.id = m.business_id |
|
|
left join wx_business bu on b.id = m.business_id |
|
|
where ms.is_del = 0 |
|
|
where ms.is_del = 0 |
|
|
@@ -177,7 +176,6 @@ |
|
|
select |
|
|
select |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
<include refid="allMerchantVoColumns"/> |
|
|
FROM wx_merchant m |
|
|
FROM wx_merchant m |
|
|
left join wx_merchant_shop ms on ms.merchant_id = m.id |
|
|
|
|
|
left join wx_brand b on b.id = m.brand |
|
|
left join wx_brand b on b.id = m.brand |
|
|
left join wx_business bu on b.id = m.business_id |
|
|
left join wx_business bu on b.id = m.business_id |
|
|
where ms.is_del = 0 |
|
|
where ms.is_del = 0 |
|
|
|