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

lidongdong

2022-10-21 12c8caec0265ffff1c595bcab71b66201d3fbd21

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

@@ -224,7 +224,7 @@


        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId());
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");

        config.setCreateTime(LocalDateTime.now());
@@ -333,8 +333,6 @@
        {
            return error("输入密码与原密码不能相同！");
        }



        return toAjax(IUserService.updateConfig(config));
    }