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

fengjin

2022-10-18 70efbfc8399978f685e91b3ab2fb414cbaf80b63

 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()))