Merge branch 'release_real_20211001' of https://git.malls.iformall.com/server/formallProject into release_real_20211001

mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

@@ -952,6 +952,10 @@
 		<if test=" null != couponOrderStatus ">
 			and co.coupon_order_status = #{couponOrderStatus}
 		</if>
+
+		<if test=" null != shippingType ">
+			and co.`shipping_type` = #{shippingType}
+		</if>
 		
 		<if test=" null != merchantName and merchantName!=''">