Merge branch 'master' of git.oa00.com:supply-chain/service

supply/order.go

@@ -122,8 +122,6 @@ type RetailOrderItem struct {
 	SourceName     string          `json:"sourceName"`
 	CustomerName   string          `json:"customerName"`
 	OrderStatus    uint            `json:"orderStatus"`
-	LogisticsName  string          `json:"logisticsName"`
-	WaybillCode    string          `json:"waybillCode"`
 	OrderFee       decimal.Decimal `json:"orderFee"`
 	FreightFee     decimal.Decimal `json:"freightFee"`
 	SupplyOrderFee decimal.Decimal `json:"supplyOrderFee"`

supply/sku.go

@@ -163,6 +163,7 @@ func (s *sku) Lists(ctx context.Context, args ArgsSkuLists) (reply ReplySkuList,
 }
 
 type SkuEsSearch struct {
+	SourceId           uint            // 所属供应商
 	SourceStatus       uint            // 供应商上下架状态 1=上架 2=下架
 	PlatformStatus     uint            // 平台上下架状态 1=上架 2=下架
 	SkuId              uint            // Sku编码