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);