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

admin

2020-04-28 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/tb/UserExtraTaoBaoInfoServiceImpl.java

@@ -33,7 +33,7 @@
   @Resource

   private UserAccountBindingHistoryService userAccountBindingHistoryService;



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addRelationId(Long uid, String relationId, String taoBaoUid, String nickName, boolean valid)

         throws UserExtraTaoBaoInfoException {

@@ -77,7 +77,7 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void addSpecialId(Long uid, String specialId, String taoBaoUid, String nickName, boolean valid)

         throws UserExtraTaoBaoInfoException {

@@ -121,7 +121,7 @@
      }

   }



   @Transactional

   @Transactional(rollbackFor=Exception.class)

   @Override

   public void saveUserTaoBaoInfo(Long uid, String relationId, String specialId, String taoBaoUid, String nickName,

         boolean valid) throws UserExtraTaoBaoInfoException {