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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -256,8 +256,8 @@
      List<TLJBuyGoods> list = tljBuyGoodsService

            .listByDay(TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));



      if (list.size() > 30)

         list = list.subList(0, 30);

      if (list.size() > 20)

         list = list.subList(0, 20);

      List<TaoBaoGoodsBrief> finalList = new ArrayList<>();

      Map<Long, TLJBuyGoods> map = new ConcurrentHashMap<>();

      if (list != null)