From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
index 9e3a24b..90fec74 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/order/TaoBaoOrderController.java
@@ -22,8 +22,8 @@
 import com.google.gson.JsonSerializer;
 import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.job.UpdateOrderJob;
-import com.yeshi.fanli.job.UpdateRelationAndSpecialOrderJob;
+import com.yeshi.fanli.job.order.taobao.UpdateOrderJob;
+import com.yeshi.fanli.job.order.taobao.UpdateTBRelationAndSpecialOrderJob;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
 import com.yeshi.fanli.tag.PageEntity;
@@ -44,7 +44,7 @@
 	private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
 
 	@Resource
-	private UpdateRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob;
+	private UpdateTBRelationAndSpecialOrderJob updateRelationAndSpecialOrderJob;
 
 	@Resource
 	private UpdateOrderJob updateOrderJob;

--
Gitblit v1.8.0