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

2019-09-29 08:44:36 +08:00
parent 7b89b528c3 2acc0f06dd
commit 55548ced11
7 changed files with 25 additions and 12 deletions
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -89,7 +89,7 @@ var (
 		VendorIDELM:  "饿了么",
 		VendorIDEBAI: "饿百新零售",
 		VendorIDWSC:  "微盟微商城",
-		VendorIDJX:   "京西自营",
+		VendorIDJX:   "京西商城",

 		VendorIDDada: "达达众包",
 		VendorIDMTPS: "美团配送",
--- a/business/model/dao/dao.go
+++ b/business/model/dao/dao.go
@@ -13,7 +13,7 @@ import (

 const (
 	useGetRowsWhenGetRow      = true
-	transactionWarningSeconds = 5 * 60 // 5分钟
+	transactionWarningSeconds = 2 * 60 // 5分钟
 )

 type DaoDB struct {