Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-19 5534d432c81a1bcf36c89476977a8bf47d460d44

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

@@ -243,9 +243,9 @@
    @Authorization
    public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
    {
        if(config.getUserId()==null)
        if(config.getId()==null)
        {
            return error("userId不能为空");
            return error("Id不能为空");
        }

        if(StringUtils.isEmpty(config.getLoginName()))