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

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -1073,7 +1073,7 @@
         return;

      }



      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 6);

      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 6);

      if (goodsList == null)

         goodsList = new ArrayList<>();



@@ -2467,7 +2467,7 @@


      try {



         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);

         List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.guessLikeByAuctionId(id, 10);

         // 初始化

         if (goodsList == null) {

            goodsList = new ArrayList<TaoBaoGoodsBrief>();