Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-15 8f777d784ee51a7e6ad99e16072c86fea0d39ae3

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -122,7 +122,7 @@
                user.setRoleIds("2");
            }
            user.setUserType("2");
            user.setIsDivisionHead("1");
            user.setIsDivisionHead(config.getIsDivisionHead());
            user.setStatus(config.getStatus());
            user.setUpdateTime(LocalDateTime.now());
            //提示用户名或密码错误
@@ -140,7 +140,7 @@
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");
        config.setIsDivisionHead("1");
        config.setIsDivisionHead(config.getIsDivisionHead());
        return toAjax(IUserService.insertConfig(config));
    }