Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 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 {