From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index 39e5a7a..1019125 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -130,11 +130,10 @@
 			doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
 			doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
 			initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
-			doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
+			doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪			
+			doJDOrderJob();// 浜笢璁㈠崟澶勭悊
+			doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
 		}
-
-		doJDOrderJob();// 浜笢璁㈠崟澶勭悊
-		doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
 	}
 
 	/**

--
Gitblit v1.8.0