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

admin

2020-01-03 1e4e20573dfc917e7b43068da35ee532a192aacd

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -217,7 +217,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void addCommonGoods(Long uid, Set<Long> ids) throws UserGoodsStorageException {



      if (uid == null) {