解决冲突

2020-06-02 17:17:45 +08:00
parent f9ef5ab49d 73139f2860
commit 70f2161b20
14 changed files with 120 additions and 104 deletions
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1236,7 +1236,7 @@ func FixMtwmCategory(ctx *jxcontext.Context, mtwmStoreIDs []int, isAsync, isCont
 func JdStoreInfo1125() (hint string, err error) {
 	fileName := "老格恢复拓店进度.xlsx"
 	db := dao.GetDB()
-	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
+	storeList, err := dao.GetStoresMapList(db, []int{model.VendorIDJD}, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "")
 	if err == nil {
 		var validStoreList []*dao.StoreDetail
 		for _, v := range storeList {