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

admin

2020-05-16 554d3857358b0ea53c4f65d8d9baad113ef1deb4

 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));

            }

         }