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

apis/shanghu/merchant.card.go

@@ -755,7 +755,7 @@ func CancelNumberV2(c *gin.Context) {
 
 	log.MerchantID = qrMessage.MerchantId
 	log.ClientOpenID = qrMessage.ClientOpenId
-	if log.GetNumber()+inData.Number >= merchantInfo.CancelNumber {
+	if log.GetNumber()+inData.Number > merchantInfo.CancelNumber {
 		app.Error(c, 500, errors.New("剩余核销次数不够，请重新购买"), "剩余核销次数不够，请重新购买")
 		return
 	}