From ce0eb575e91b37d00fdc8ad5662cda3bddb400bf Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Wed, 8 Jan 2020 22:02:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catch/permissions/database/migrations/20191208125722_roles.php   | 1 +
 .../database/migrations/20191208125726_permissions.php           | 1 +
 catch/permissions/model/Permissions.php                          | 1 +
 catch/permissions/model/Roles.php                                | 1 +
 4 files changed, 4 insertions(+)

diff --git a/catch/permissions/database/migrations/20191208125722_roles.php b/catch/permissions/database/migrations/20191208125722_roles.php
index 6c0412d..7bc4e01 100644
--- a/catch/permissions/database/migrations/20191208125722_roles.php
+++ b/catch/permissions/database/migrations/20191208125722_roles.php
@@ -32,6 +32,7 @@ class Roles extends Migrator
         $table->addColumn('role_name', 'string',['limit'  =>  15,'default'=>'','comment'=>'角色名'])
             ->addColumn('parent_id', 'integer',['default'=>0,'comment'=>'父级ID', 'signed' => false])
             ->addColumn('description', 'string',['default'=> '','comment'=>'角色备注'])
+            ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
             ->addColumn('created_at', 'integer', array('default'=>0,'comment'=>'创建时间', 'signed' => false ))
             ->addColumn('updated_at', 'integer', array('default'=>0,'comment'=>'更新时间', 'signed' => false))
             ->addColumn('deleted_at', 'integer', array('default'=>0,'comment'=>'删除状态，0未删除 >0 已删除', 'signed' => false))
diff --git a/catch/permissions/database/migrations/20191208125726_permissions.php b/catch/permissions/database/migrations/20191208125726_permissions.php
index d57d0f0..596f778 100644
--- a/catch/permissions/database/migrations/20191208125726_permissions.php
+++ b/catch/permissions/database/migrations/20191208125726_permissions.php
@@ -34,6 +34,7 @@ class Permissions extends Migrator
             ->addColumn('route', 'string', ['default' => '', 'comment' => '路由', 'limit' => 50])
             ->addColumn('icon', 'string', ['default' => '', 'comment' => '菜单图标', 'limit' => 50])
             ->addColumn('module', 'string', ['default' => '', 'comment' => '模块', 'limit' => 20])
+            ->addColumn('creator_id', 'integer',['default' => 0, 'comment'=>'创建人ID'])
             ->addColumn('method', 'string', ['default' => 'get', 'comment' => '路由请求方法', 'limit' => 15])
             ->addColumn('permission_mark', 'string', ['null' => false, 'comment' => '权限标识', 'limit' => 50])
             ->addColumn('type', 'integer',['limit' => \Phinx\Db\Adapter\MysqlAdapter::INT_TINY,'default'=> 1,'comment'=>'1 菜单 2 按钮'])
diff --git a/catch/permissions/model/Permissions.php b/catch/permissions/model/Permissions.php
index cd0c754..fe7ede4 100644
--- a/catch/permissions/model/Permissions.php
+++ b/catch/permissions/model/Permissions.php
@@ -12,6 +12,7 @@ class Permissions extends CatchModel
 			'permission_name', // 菜单名称
 			'parent_id', // 父级ID
       'icon',
+      'creator_id',
       'module', // 模块
 			'route', // 路由
       'method', // 请求方法
diff --git a/catch/permissions/model/Roles.php b/catch/permissions/model/Roles.php
index b6ba69b..024018e 100644
--- a/catch/permissions/model/Roles.php
+++ b/catch/permissions/model/Roles.php
@@ -12,6 +12,7 @@ class Roles extends CatchModel
             'id', // 
 			'role_name', // 角色名
 			'parent_id', // 父级ID
+      'creator_id',
 			'description', // 角色备注
 			'created_at', // 创建时间
 			'updated_at', // 更新时间