Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

business/model/dao/store_sku.go

@@ -138,6 +138,7 @@ type StoreSkuNameExt struct {
 	PendingOpType    int8 `json:"pendingOpType"`    // 取值同 StoreOpRequest.Type
 	PendingUnitPrice int  `json:"pendingUnitPrice"` // 这个是待审核的价格申请
 	Status           int
+	RealMidUnitPrice int `json:"realMidUnitPrice"`
 }
 
 // GetStoreSkus用
@@ -206,11 +207,12 @@ type StoreSkuExt struct {
 
 type SkuNameAndPlace struct {
 	model.SkuName
-	CityCode int    `json:"cityCode"`
-	CityName string `json:"cityName"`
-	Sequence int    `json:"sequence"`
-	Count    int    `json:"count"`
-	Type     int    `json:"type"`
+	CityCode int                 `json:"cityCode"`
+	CityName string              `json:"cityName"`
+	Sequence int                 `json:"sequence"`
+	Count    int                 `json:"count"`
+	Type     int                 `json:"type"`
+	Skus     []*model.SkuAndName `json:"skus"`
 }
 
 type StoreSkuPriceAndWeight struct {