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

张天森

2022-11-15 46c5ed0e7f09b6fce7b19e3825970c3b031a5858

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

@@ -246,7 +246,7 @@
                config.setUserId(user.getUserId());
                config.setCreateBy(user.getUserId()+"");
                config.setUserType("3");

                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
@@ -264,7 +264,7 @@
                config.setUserId(user2.getUserId());
                config.setCreateBy(user2.getUserId()+"");
                config.setUserType("3");

                config.setIsDivisionHead("1");
                config.setUpdateTime(LocalDateTime.now());
                return toAjax(IUserService.updateConfig(config));
            }
@@ -278,6 +278,7 @@
        config.setCreateBy(sysUser.getUserId()+"");
        config.setUserId(Snowflake.getId()+"");
        config.setUserType("3");
        config.setIsDivisionHead("1");

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());