From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 863bf7c..d4a6051 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -99,9 +99,10 @@
 			doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
 			doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
 			doThreeSaleUserCouponJob();// 澶勭悊閭�璇烽槦鍒�
+			doUpdateGoodsJob();
 		} else if (!Constant.IS_TEST) {
 			initScheduler();// 鍚姩瀹氭椂浠诲姟
-			// doUpdateGoodsJob();
+			// 
 		}
 	}
 

--
Gitblit v1.8.0