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

apis/shanghu/merchant.card.go

@@ -225,6 +225,7 @@ func GetMerchantCanvasCard(c *gin.Context) {
 		dataList.Name = projectInfo.ProjectName
 		dataList.Count = 1
 		dataList.Price = projectInfo.ProjectUnitPrice
+		dataList.Unit = projectInfo.ProjectUnit
 		outData.DataList = append(outData.DataList, dataList)
 	}
 	var buy models.BuyKnowList

apis/shanghu/models/card.go

@@ -81,6 +81,7 @@ type DataList struct {
 	Name  string `json:"name"`
 	Count int    `json:"count"`
 	Price string `json:"price"`
+	Unit  string `json:"unit"`
 }
 type BuyKnowList struct {
 	Icon  string `json:"icon"`