Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/ShareHotGoodsServiceImpl.java

@@ -22,7 +22,8 @@
      if (goods == null || StringUtil.isNullOrEmpty(goods.getDay()) || goods.getGoods() == null)

         return;

      goods.setId(StringUtil.Md5(goods.getDay() + "#" + goods.getGoods().getAuctionId()));

      goods.setUpdateTime(new Date());

      if (goods.getUpdateTime() == null)

         goods.setUpdateTime(new Date());

      shareHotGoodsDao.save(goods);

   }