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

lidongdong

2022-10-13 dc2145e16abaa09f89ab5319fc84c8a53e3cea69

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

@@ -212,7 +212,7 @@
            return error("该账户已存在！");
        }

        config.setUserType("1");
        config.setUserType("3");

        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
@@ -241,7 +241,7 @@
            return error("账户不能为空");
        }

        config.setUserType("1");
        config.setUserType("3");

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