Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-21 1ebec13714da4841dd827b0b5914b48161a170b0

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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