Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

2021-07-06 17:35:43 +08:00
parent d241e218ce 362f8ae984
commit 24f0350d44
4 changed files with 30 additions and 84 deletions
@@ -295,7 +295,6 @@ class gitlabModel extends model
    }

    /**
->>>>>>> 388f6365c925b48fc5fe9db65977f00ad4bda236
     * Get current user.
     *
     * @param  string   $host