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

yujian

2020-05-12 eff294ec92d77f0e1cbb65702d534bbe6813c0ee

 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java

@@ -96,7 +96,7 @@


            if (TaoBaoUtil.canAddToTLJBuyGoods(goods)) {

               count++;

               goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods);

               goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();

               shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));

            }

         }