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

Administrator

2020-03-01 666e5d4bae10a7082823bfbe91d0fa7e51f5ad2d

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/RecommendUserGoodsServiceImpl.java

@@ -30,7 +30,7 @@
   @Resource

   private CommonGoodsService commonGoodsService;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addRecommend(Long uid, String device, String recommendDesc, List<CommonGoods> goodsList)

         throws RecommendUserGoodsException {