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

apis/shanghu/merchant.card.go

@@ -170,6 +170,7 @@ func GetMerchantCanvasCard(c *gin.Context) {
 	//	return
 	//}
 
+	outData.Inventory = merchantCard.Inventory
 	outData.SwiperList = swiperList
 
 	rightButton.ImageURL = "/images/资源 24.png"

apis/shanghu/models/card.go

@@ -51,6 +51,7 @@ type GetMerchantCanvasCardReply struct {
 	FenxiangShow           bool            `json:"fenxiangShow"`
 	MerchantAmount         decimal.Decimal `json:"merchantAmount"`
 	MerchantOriginalAmount decimal.Decimal `json:"merchantOriginalAmount"`
+	Inventory              int64           `json:"inventory"`
 }
 type Static struct {
 	Background string `json:"background"`