Merge branch 'develop' of k.zhang/duoduo into master

apis/shanghu/merchant.card.go

@@ -760,10 +760,10 @@ func CancelNumberV2(c *gin.Context) {
 		return
 	}
 
-	if merchantInfo.MerchantOpenID != inData.MerchantOpenId {
-		app.Error(c, 500, errors.New("核销商家与发卡商家不一致"), "核销商家与发卡商家不一致")
-		return
-	}
+	//if merchantInfo.MerchantOpenID != inData.MerchantOpenId {
+	//	app.Error(c, 500, errors.New("核销商家与发卡商家不一致"), "核销商家与发卡商家不一致")
+	//	return
+	//}
 
 	for i := 0; i < inData.Number; i++ {
 		log.MerchantID = qrMessage.MerchantId