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

supply/channel/sku.go

@@ -80,12 +80,19 @@ type SkuEsSearch struct {
 	MinDiscount        decimal.Decimal          // 最低折扣
 	MaxDiscount        decimal.Decimal          // 最高折扣
 	Expand             []map[string]interface{} // 拓展查询
+	CustomerSearch     CustomerSearch           // 客户系统的搜索条件
 }
 type ArgsSkuListsEs struct {
 	Search SkuEsSearch
 	Page   bean.Page
 }
 
+type CustomerSearch struct {
+	SkuName   string
+	SkuId     uint
+	BrandName string
+}
+
 // ListsEs @Title es商品列表 目前最大10000条数据，超出不显示
 func (s *sku) ListsEs(ctx context.Context, channelId string, args ArgsSkuListsEs) (reply ReplySkuList, err error) {
 	xClient, err := client.GetClient(s)