From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 c81c120..1961534 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -91,7 +91,7 @@
 			doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
 		} else if (!Constant.IS_TEST) {
 			initScheduler();// 鍚姩瀹氭椂浠诲姟
-			doUpdateGoodsJob();
+			// doUpdateGoodsJob();
 		}
 	}
 
@@ -376,7 +376,7 @@
 								}
 							}
 						} catch (Exception e) {
-							LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:"+e.getMessage());
+							LogHelper.error("鏇存柊鍟嗗搧鍑洪敊:" + e.getMessage());
 
 						}
 					}

--
Gitblit v1.8.0