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

@@ -172,7 +172,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
             } else if (thirdPartVo.getOpenId().equals(param.getOpenId())) {
                 userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
             } else {
-                return ResponseDto.failure(ErrorMapping.get("10007"));
+                return ResponseDto.failure(ErrorMapping.get("10010"));
             }
         }
         return ResponseDto.success(userInfoVo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -13,7 +13,7 @@
 10007=该第三方账号已经被其他用户绑定
 10008=已经绑定过该类型的第三方账号
 10009=手机号已经注册
-10010=
+10010=该手机号已被其它账号绑定
 10011=性别标签无效
 10012=音乐风格标签无效
 10013=