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/controller/xcx/XcxRecommendController.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
index 6c9cfa3..df77830 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxRecommendController.java
@@ -8,6 +8,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -21,7 +22,6 @@
 import com.yeshi.fanli.service.inter.config.JumpDetailService;
 import com.yeshi.fanli.service.inter.config.SystemConfigService;
 import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
 import com.yeshi.fanli.service.inter.goods.HonestService;
 import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
 import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
@@ -43,7 +43,6 @@
 import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
 
 import net.sf.json.JSONObject;
 
@@ -108,8 +107,7 @@
 	@Resource
 	private HonestService honestService;
 
-	@Resource
-	private CollectionGoodsService collectionGoodsService;
+
 
 	@Resource
 	private HongBaoManageMapper hongBaoManageMapper;

--
Gitblit v1.8.0