From 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 16:10:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
index 6a10401..a256eb1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -354,7 +354,6 @@
 	@RequestMapping("getSpikTime")
 	public void getSpikTime(AcceptData acceptData, PrintWriter out) {
 		List<DingDongTime> timeList = DaTaoKeUtil.getDingDongQiangTime(Calendar.getInstance());
-
 		List<SpikeTimeVO> list = new ArrayList<SpikeTimeVO>();
 		for (int i = 0; i < timeList.size(); i++) {
 			SpikeTimeVO spikeTime1 = new SpikeTimeVO();

--
Gitblit v1.8.0