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

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -190,7 +190,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void bindTpa(String uid, AdamThirdPartParam param) {
         LocalDateTime now = LocalDateTime.now();
 
@@ -223,7 +223,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void bindTpaForce(String bindUid, String unBindUid, AdamThirdPartParam param) {
         this.unBindTpaProcess(unBindUid, param.getPlatform());