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

apis/shanghu/merchant.card.go

@@ -268,9 +268,9 @@ func GetMerchantCanvasCard(c *gin.Context) {
 
 	//返回邀请码
 
-	if inData.Code == "yuanshima" { //可以分享
+	if inData.Code == "yuanshima" { //可以分享   code 等于自己的与yuanshima的都给平台
 		outData.IsShare = true
-		outData.InvitationCode = "7jb6"
+		outData.InvitationCode = "yuanshima"
 	} else { //查询购买记录，没有购买过不让分享
 		var payTrans shanghu.ClientPayTrans
 		var userInfo shanghu.MerchantClientUser