|
|
@@ -967,6 +967,10 @@ |
|
|
<if test=" null != shippingType "> |
|
|
<if test=" null != shippingType "> |
|
|
and co.`shipping_type` = #{shippingType} |
|
|
and co.`shipping_type` = #{shippingType} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
|
|
|
<if test=" null != shippingStatus "> |
|
|
|
|
|
and co.`shipping_status` = #{shippingStatus} |
|
|
|
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != merchantName and merchantName!=''"> |
|
|
<if test=" null != merchantName and merchantName!=''"> |
|
|
|
|
|
|
|
|
|