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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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 {