Merge branch 'master' into mark

2019-12-17 10:07:13 +08:00
parent b985b1a907 272462f3eb
commit 16b772f13c
4 changed files with 13 additions and 12 deletions
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -45,10 +45,10 @@ type GoodsOrderExt struct {

 type OrderSkuExt struct {
 	OrderSku
-	NameID           int    `orm:"column(name_id)" json:"nameID"`
-	FullSkuName      string `json:"fullSkuName"`
-	Image            string `json:"image"`
-	RealEarningPrice int64  `json:"realEarningPrice"` // 实际单品结算给门店老板钱
+	NameID      int    `orm:"column(name_id)" json:"nameID"`
+	FullSkuName string `json:"fullSkuName"`
+	Image       string `json:"image"`
+	// RealEarningPrice int64  `json:"realEarningPrice"` // 实际单品结算给门店老板钱
 }

 type GoodsOrderCountInfo struct {