From 0725b4cfff825525b2e93f5b0b36a8dc31f9fada Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Wed, 24 Nov 2021 17:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ccsens/signin/api/UserController.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/signin/src/main/java/com/ccsens/signin/api/UserController.java b/signin/src/main/java/com/ccsens/signin/api/UserController.java
index 187d10d0..6caa9da0 100644
--- a/signin/src/main/java/com/ccsens/signin/api/UserController.java
+++ b/signin/src/main/java/com/ccsens/signin/api/UserController.java
@@ -258,8 +258,8 @@ public class UserController {
         } catch (BaseException e) {
             if (e.getCode().intValue() == CodeEnum.MERGE_WX_PHONE.getCode().intValue()) {
                 log.info("绑定手机号，需要合并：{},{}", phone, currentUserId);
-                JsonResponse ok = JsonResponse.newInstance();
-                ok.setMsg(e.getMessage());
+                JsonResponse ok = JsonResponse.newInstance().ok(e);
+//                ok.setMsg(e.getMessage());
                 UserVo.TokenBean tokenBean = new UserVo.TokenBean();
                 tokenBean.setPhone(phone);
                 ok.setData(tokenBean);