Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -419,7 +419,7 @@ public class AppLoginController extends AppBaseController{
                     if (StringUtils.isNotEmpty(userByUnionId.getPhone())&&!user.getPhone().equals(userByUnionId.getPhone())){
                         return R.error("该微信已绑定其他手机号");
                     }
-                    userByUnionId.setPhone(user.getPhone());
+                    userByUnionId.setPhone(param.getPhone());
                     userByUnionId.setSource(param.getSource() != null ? param.getSource() : null );
                     userByUnionId.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null);
                     userByUnionId.setNickName(nickname);