From 1ebec13714da4841dd827b0b5914b48161a170b0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 14:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 1fba376..47af669 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -98,8 +98,11 @@
         SysUser user=IUserService.selectData(null,config.getPhonenumber());
         if (user != null)
         {
+            user.setRoleIds(2+"");
+            user.setUserType("2");
+            user.setUpdateTime(LocalDateTime.now());
             //提示用户名或密码错误
-            return ResultData.error("该手机号已注册账户!请更换");
+            return toAjax(IUserService.updateConfig(user));
         }
         config.setRoleIds(2+"");
         config.setCreateTime(LocalDateTime.now());

--
Gitblit v1.7.1