冲突修改

2020-03-30 09:57:11 +08:00
parent 7c01a20bf8 b0fdf7af1d
commit 949e308c59
3 changed files with 18 additions and 15 deletions
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -284,9 +284,10 @@ type SkuWithVendor struct {

 type SkuNameExt struct {
 	SkuName
-	Skus      []*SkuWithVendor `orm:"-" json:"skus"`
-	SkusStr   string           `json:"-"`
-	FullName  string           `json:"fullName"`
-	Places    []int            `orm:"-" json:"places"`
-	PlacesStr string           `json:"-"`
+	Skus         []*SkuWithVendor `orm:"-" json:"skus"`
+	SkusStr      string           `json:"-"`
+	FullName     string           `json:"fullName"`
+	Places       []int            `orm:"-" json:"places"`
+	PlacesStr    string           `json:"-"`
+	MidUnitPrice int              `json:"midUnitPrice"`
 }