Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-31 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff

 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();