From 308ee3120ee349fe3b3aba51f2c6d873639062b3 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Wed, 22 Apr 2020 06:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=94=A8=E6=88=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/controller/User.php          | 6 +++---
 catch/permissions/database/seeds/UsersSeed.php | 2 +-
 catch/permissions/model/Roles.php              | 1 -
 catch/permissions/request/CreateRequest.php    | 4 ++--
 catch/permissions/request/UpdateRequest.php    | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/catch/permissions/controller/User.php b/catch/permissions/controller/User.php
index 3070c10..9924a92 100644
--- a/catch/permissions/controller/User.php
+++ b/catch/permissions/controller/User.php
@@ -4,9 +4,9 @@ namespace catchAdmin\permissions\controller;
 use catcher\base\CatchRequest as Request;
 use catchAdmin\permissions\model\Permissions;
 use catchAdmin\permissions\model\Roles;
-use catchAdmin\user\model\Users;
-use catchAdmin\user\request\CreateRequest;
-use catchAdmin\user\request\UpdateRequest;
+use catchAdmin\permissions\model\Users;
+use catchAdmin\permissions\request\CreateRequest;
+use catchAdmin\permissions\request\UpdateRequest;
 use catcher\base\CatchController;
 use catcher\CatchAuth;
 use catcher\CatchCacheKeys;
diff --git a/catch/permissions/database/seeds/UsersSeed.php b/catch/permissions/database/seeds/UsersSeed.php
index 16500af..bd10764 100644
--- a/catch/permissions/database/seeds/UsersSeed.php
+++ b/catch/permissions/database/seeds/UsersSeed.php
@@ -14,7 +14,7 @@ class UsersSeed extends Seeder
      */
     public function run()
     {
-        return \catchAdmin\user\model\Users::create([
+        return \catchAdmin\permissions\model\Users::create([
             'username' => 'admin',
             'password' => 'admin',
             'email'    => 'admin@gmail.com',
diff --git a/catch/permissions/model/Roles.php b/catch/permissions/model/Roles.php
index a67f8a9..e8b321b 100644
--- a/catch/permissions/model/Roles.php
+++ b/catch/permissions/model/Roles.php
@@ -2,7 +2,6 @@
 namespace catchAdmin\permissions\model;
 
 use catchAdmin\permissions\model\search\RolesSearch;
-use catchAdmin\user\model\Users;
 use catcher\base\CatchModel;
 
 class Roles extends CatchModel
diff --git a/catch/permissions/request/CreateRequest.php b/catch/permissions/request/CreateRequest.php
index 7e56e57..ddc8bdb 100644
--- a/catch/permissions/request/CreateRequest.php
+++ b/catch/permissions/request/CreateRequest.php
@@ -1,7 +1,7 @@
 <?php
-namespace catchAdmin\permission\request;
+namespace catchAdmin\permissions\request;
 
-use catchAdmin\user\model\Users;
+use catchAdmin\permissions\model\Users;
 use catcher\base\CatchRequest;
 
 class CreateRequest extends CatchRequest
diff --git a/catch/permissions/request/UpdateRequest.php b/catch/permissions/request/UpdateRequest.php
index 79ac79f..5d69de4 100644
--- a/catch/permissions/request/UpdateRequest.php
+++ b/catch/permissions/request/UpdateRequest.php
@@ -1,7 +1,7 @@
 <?php
-namespace catchAdmin\permission\request;
+namespace catchAdmin\permissions\request;
 
-use catchAdmin\user\model\Users;
+use catchAdmin\permissions\model\Users;
 use catcher\base\CatchRequest;
 
 class UpdateRequest extends CatchRequest