From 7663de128712c74f827f09281e48908ea8ddf3e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 5 Feb 2020 15:41:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?store=E5=8A=A0=E5=B8=82=E5=9C=BA=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/business/model/store.go b/business/model/store.go
index 830923cb6..30fb3db2d 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -328,6 +328,9 @@ type Store struct {
 	OperatorPhone2 string `orm:"size(16)" json:"operatorPhone2"` // 非京东运营人电话
 	OperatorRole2  string `orm:"size(32)" json:"operatorRole2"`  // 非京东运营人组（角色）
 	PromoteInfo    string `orm:"size(255)" json:"promoteInfo"`   //门店公告（所有平台统一的公告）
+
+	PopularManPhone  string `orm:"size(16)" json:"marketManPhone"` // 市场推广人电话
+	DividePercentage int    `json:"dividePercentage"`              //分成比例(给市场推广的分成)
 }
 
 func (*Store) TableUnique() [][]string {

From 3c786ba1283d4f95da4829b67391fcb955510a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 5 Feb 2020 15:49:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?store=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/model/store.go b/business/model/store.go
index 30fb3db2d..11053b4b7 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -329,8 +329,8 @@ type Store struct {
 	OperatorRole2  string `orm:"size(32)" json:"operatorRole2"`  // 非京东运营人组（角色）
 	PromoteInfo    string `orm:"size(255)" json:"promoteInfo"`   //门店公告（所有平台统一的公告）
 
-	PopularManPhone  string `orm:"size(16)" json:"marketManPhone"` // 市场推广人电话
-	DividePercentage int    `json:"dividePercentage"`              //分成比例(给市场推广的分成)
+	PopularManPhone  string `orm:"size(16)" json:"popularManPhone"` // 市场推广人电话
+	DividePercentage int    `json:"dividePercentage"`               //分成比例(给市场推广的分成)
 }
 
 func (*Store) TableUnique() [][]string {

From e9f59f91bf420e76ce045cd6d5d46fb9f29d3e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 5 Feb 2020 17:25:39 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1payAppid=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index ffa4c0e89..c8214c064 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -51,7 +51,7 @@ weixinPageSecret = "c7a84ed3ef3ae04ac78e02fb593ffbe5"
 weixinMiniAppID  = "wx08a5c2a8581414ff"
 weixinMiniSecret = "e7ec67c86cbd4dfa531af7af7533cdc9"
 
-wxpayAppID = "wx2bb99eb5d2c9b82c"
+wxpayAppID = "wx4b5930c13f8b1170"
 wxpayAppKey = "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD"
 wxpayAppMchID = "1390686702"
 wxpayNotifyURL = "http://callback.test.jxc4.com/wxpay/msg/"

From 9ca394e5c77d40fca6fc0c73c45990dd3c5e925a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 5 Feb 2020 17:27:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E4=BA=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=9C=A8=E9=97=A8=E5=BA=97=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/business/model/store.go b/business/model/store.go
index 11053b4b7..830923cb6 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -328,9 +328,6 @@ type Store struct {
 	OperatorPhone2 string `orm:"size(16)" json:"operatorPhone2"` // 非京东运营人电话
 	OperatorRole2  string `orm:"size(32)" json:"operatorRole2"`  // 非京东运营人组（角色）
 	PromoteInfo    string `orm:"size(255)" json:"promoteInfo"`   //门店公告（所有平台统一的公告）
-
-	PopularManPhone  string `orm:"size(16)" json:"popularManPhone"` // 市场推广人电话
-	DividePercentage int    `json:"dividePercentage"`               //分成比例(给市场推广的分成)
 }
 
 func (*Store) TableUnique() [][]string {