Merge remote-tracking branch 'origin/master'

yujian

2019-06-11 aba5dee7a341ecb60fe02f088684aa982ac037f9

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

@@ -1941,8 +1941,11 @@
         finalImgList.add(0, tb.getPictUrlWhite());



      // 大淘客商品过滤

      try {

      goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);



      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }

      JSONObject goodsJson = new JSONObject();

      goodsJson.put("auctionId", tb.getAuctionId());

      goodsJson.put("imgList", finalImgList);