解决冲突

2020-06-02 17:17:45 +08:00
parent f9ef5ab49d 73139f2860
commit 70f2161b20
14 changed files with 120 additions and 104 deletions
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -1289,7 +1289,7 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
 			vendorIDs = []int{actVendorID}
 		}
 	} else {
-		storeMapList, err := GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+		storeMapList, err := GetStoresMapList(db, nil, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "")
 		if err != nil {
 			return err
 		}