From 35c25585cf6fea9e29574a75a03c57381cbe19e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 16:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |    8 ++++----
 1 files changed, 4 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..681211a 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,11 @@
 			doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
 			doUserMoneyDebtJob();// 鍊哄姟鍋胯繕
 			initScheduler();// 鍚姩鍟嗗搧鏇存柊瀹氭椂浠诲姟
-			doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
+			doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪			
+			doJDOrderJob();// 浜笢璁㈠崟澶勭悊
+			doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
 		}
-
-		doJDOrderJob();// 浜笢璁㈠崟澶勭悊
-		doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
+		
 	}
 
 	/**

--
Gitblit v1.8.0