From 6887fbc18ac5832fb9ab558a6d596d429910edde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 29 Nov 2019 15:03:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=B0=B8=E8=BE=89excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/yonghui/yonghui.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/yonghui/yonghui.go b/business/jxstore/yonghui/yonghui.go
index 2b1942188..ea82f5d38 100644
--- a/business/jxstore/yonghui/yonghui.go
+++ b/business/jxstore/yonghui/yonghui.go
@@ -138,7 +138,7 @@ var (
 			OrgSkuIdCol:    4,
 			OrgSkuPriceCol: 7,
 			OrgSkuNameCol:  5,
-			SkuRow:         2,
+			SkuRow:         1,
 		}, "水产": &SheetParam{
 			SkuIDCol:       1,
 			SkuPriceCol:    15,
@@ -264,7 +264,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 			if errMsg == "" {
 				isExecute = true
 			} else {
-				err = fmt.Errorf(errMsg)
+				return "", fmt.Errorf(errMsg)
 			}
 			if isExecute {
 				isCompare, err = UpdateClassifyAndGetLastClassify()

From 648357c4234af139316b41f682c5b755b91050f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 29 Nov 2019 16:15:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 8f8dd250c..7282cd430 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1511,6 +1511,10 @@ func GetJdUsers(ctx *jxcontext.Context, isAsync, isContinueWhenError bool) (hint
 					vendorStoreIDsMap[v] = jxVendorIDsMap[v]
 				}
 				if len(vendorStoreIDsMap) == 0 {
+					if vv.LoginName == "jd_jxcs1223" || vv.LoginName == "jd_jxgy" {
+						jdStruct := JdUserStruct{vv.LoginName, "管理员", vv.LockStatus}
+						jdUsersStruct.AppendData(jdStruct)
+					}
 					jdStruct := JdUserStruct{vv.LoginName, "", vv.LockStatus}
 					jdUsersStruct.AppendData(jdStruct)
 				} else {