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

apis/shanghu/merchant.card.go

@@ -144,6 +144,7 @@ func GetMerchantCard(c *gin.Context) {
 	outData.W = merchantCard.W
 	outData.H = merchantCard.H
 	outData.BackgroundImage = merchantCard.BackgroundImage
+	outData.CardTotalPrice = merchantCard.CardTotalPrice
 
 	app.OK(c, outData, app.Success)
 

apis/shanghu/models/card.go

@@ -46,6 +46,7 @@ type GetMerchantCardReply struct {
 	H                 string `json:"h"`                // h
 	X                 string `json:"x"`                // x
 	Y                 string `json:"y"`                // y
+	CardTotalPrice    string `json:"card_total_price"` // 总价
 
 }