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

张天森

2022-10-19 d23274eb4b60a2c5a90fb62654b8d6420f0e073b

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