Merge branch 'develop'

app/common/model/Corp.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+/**
+ * corp 企业-信息
+ * @property integer $id ID(主键)
+ * @property string $name 名称
+ * @property string $abbr 缩写
+ * @property string $tenant_key 飞书企业标识
+ * @property integer $sort 排序
+ * @property integer $status 状态
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ */
+class Corp extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'corp';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+}

app/common/model/CorpFeishuApp.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+/**
+ * corp_feishu_app 企业-飞书应用
+ * @property integer $id ID(主键)
+ * @property integer $corp_id 公司ID
+ * @property string $name 名称
+ * @property string $tenant_key 企业标识
+ * @property string $app_id 应用ID
+ * @property string $app_secret 应用秘钥
+ * @property string $base_uri 基础域
+ * @property string $r_url 授权地址
+ * @property string $scopes 授权范围
+ * @property string $state 携带参数
+ * @property string $system_code 绑定系统码
+ * @property integer $sort 排序
+ * @property integer $status 状态
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ */
+class CorpFeishuApp extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'corp_feishu_app';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+}

app/common/model/Role.php

@@ -41,6 +41,8 @@ class Role extends Model
      * @var bool
      */
     public $timestamps = true;
+
+    protected $dateFormat = 'U';
     
     // 角色下所有用户
     public function users()

app/common/model/User.php

@@ -58,7 +58,12 @@ class User extends Model
         'phone',
         'email',
         'status',
-        'system_code'
+        'corp_id',
+        'user_type',
+        'union_id',
+        'user_id',
+        'open_id',
+        'tenant_key'
     ];
     
     // 用户所有角色

app/common/model/UserFeishuApp_bak.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace app\common\model;
+
+use support\Model;
+
+/**
+ * user_feishu_app 用户-飞书应用
+ * @property integer $id ID(主键)
+ * @property integer $uid 用户ID
+ * @property integer $corp_id 公司ID
+ * @property string $name 名称
+ * @property string $mobile 手机
+ * @property string $union_id ISV的唯一标识
+ * @property string $user_id 用户 user_id
+ * @property string $open_id 应用内的唯一标识
+ * @property string $tenant_key 当前企业标识
+ * @property integer $sort 排序
+ * @property integer $status 状态
+ * @property integer $created_at 创建时间
+ * @property integer $updated_at 更新时间
+ */
+class UserFeishuApp_bak extends Model
+{
+    /**
+     * The connection name for the model.
+     *
+     * @var string|null
+     */
+    protected $connection = 'mysql';
+    
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'user_feishu_app';
+
+    /**
+     * The primary key associated with the table.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    
+    
+    protected $dateFormat = 'U';
+    
+
+    protected $fillable = [
+        'uid',
+        'corp_id',
+        'name',
+        'mobile',
+        'union_id',
+        'user_id',
+        'open_id',
+        'tenant_key',
+        'sort',
+        'status'
+    ];
+}