From 603203f018fa5d105070574bd3383c8fe4d72bb0 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期五, 09 十一月 2018 18:09:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 0b9f081..4f6a9fe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -20,7 +20,7 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.yeshi.utils.IPUtil;
 import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.NumberUtil;
 import org.yeshi.utils.taobao.TbImgUtil;
 
 import com.google.gson.Gson;
@@ -197,12 +197,13 @@
 
 	@Resource
 	private ShamUserService shamUserService;
+
 	@Resource
 	private SpecialService specialService;
 	
 	@Resource
 	private SwiperPictureService swiperPictureService;
-	
+	
 
 	@Resource
 	private MonitorService monitorService;
@@ -1578,6 +1579,7 @@
 		out.print(JsonUtil.loadTrueResult(root));
 	}
 
+
 	/**
 	 * 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
 	 * 
@@ -1686,7 +1688,7 @@
 	}
 	
 	
-	
+	
 	/**
 	 * 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
 	 * 

--
Gitblit v1.8.0