From 9c56e822b443da4107474de914a333b8aa93bcff Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:27 +0800
Subject: [PATCH] Merge branch 'master' into div1

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |    1 +
 1 files changed, 1 insertions(+), 0 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 245d597..f574aa2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -87,6 +87,7 @@
 			doExtractResult();// 澶勭悊鎻愮幇缁撴灉
 			doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
 			doOrderFanLi();// 澶勭悊璁㈠崟杩斿埄
+			doOrderFanLiNew();//鏂扮増杩斿埄
 			doOrderTiChengFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
 			doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
 			doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅

--
Gitblit v1.8.0