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

supply/brand.go

@@ -91,3 +91,13 @@ func (b *brand) FindByIds(ctx context.Context, args ArgsBrandFindByIds) (result
 	err = xClient.Call(ctx, "FindByIds", args, &result)
 	return
 }
+
+// Export @Title 导出品牌
+func (b *brand) Export(ctx context.Context, name string) (result []BrandItem, err error) {
+	xClient, err := client.GetClient(b)
+	if err != nil {
+		return
+	}
+	err = xClient.Call(ctx, "Export", name, &result)
+	return
+}

supply/sku.go

@@ -60,8 +60,9 @@ type ArgsSkuAdd struct {
 }
 
 type SkuImg struct {
-	Id   uint   `json:"id"`
-	Path string `json:"path"`
+	Id          uint   `json:"id"`
+	Path        string `json:"path"`
+	ReplacePath string `json:"replacePath"`
 }
 
 type SkuSpecification struct {
@@ -238,6 +239,7 @@ func (s *sku) GetImgs(ctx context.Context, skuId uint) (reply []SkuImg, err erro
 
 type ArgsReplaceImg struct {
 	Id          uint
+	SkuId       uint
 	ReplacePath string
 }