Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

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

@@ -474,7 +474,7 @@
 		<if test=" null != business ">
 			and c.business = #{business}
 		</if>
-		<if test=" null != verifyMerchantName ''!= verifyMerchantName ">
+		<if test=" null != verifyMerchantName and ''!= verifyMerchantName ">
 			and bu.verify_merchant_name = #{verifyMerchantName}
 		</if>