Merge remote-tracking branch 'origin/div' into div

admin

2019-09-03 74ee9c42c1d87f3724a21e92871bc8c95c8364c6

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/recommend/HomeRecommendGoodsServiceImpl.java

@@ -274,8 +274,8 @@


      if (finalList != null && finalList.size() > 0) {

         Collections.shuffle(finalList);

         if (finalList.size() >= 3)

            finalList = finalList.subList(0, 3);

         if (finalList.size() >= 10)

            finalList = finalList.subList(0, 10);

         list = new ArrayList<>();

         for (TaoBaoGoodsBrief goods : finalList) {

            list.add(map.get(goods.getAuctionId()));