Merge remote-tracking branch 'origin/mark' into yonghui

2019-12-10 17:52:48 +08:00
parent 4d8504d39c b448f6996c
commit 9439aa17b6
1 changed files with 4 additions and 3 deletions
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -532,9 +532,10 @@ func (a *ActManager) CreateActFromVendor(ctx *jxcontext.Context, act2 *model.Act

 func createActFromVendor(ctx *jxcontext.Context, db *dao.DaoDB, act2 *model.Act2, actStoreSku []*model.ActStoreSku2) (actID int, err error) {
 	actMap := &model.ActMap{
-		VendorID:    act2.VendorID,
-		VendorActID: act2.VendorActID,
-		SyncStatus:  0,
+		VendorID:      act2.VendorID,
+		VendorOrgCode: act2.VendorOrgCode,
+		VendorActID:   act2.VendorActID,
+		SyncStatus:    0,
 	}
 	dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName())
 	if actMap.VendorActID != "" {