Merge branch 'develop' into feature/crmAdmin0717

# Conflicts:
#	app/admin/controller/RoleController.php
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/logic/PermLogic.php
#	app/common/model/User.php
#	app/common/service/PermService.php
#	app/common/validate/RoleValidate.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/ticket/controller/ConversationController.php
#	app/ticket/controller/TicketController.php
#	app/ticket/logic/TicketLogic.php
#	app/ticket/service/CategorieService.php
#	app/ticket/service/TicketService.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/common/model/Role.php

@@ -53,6 +53,6 @@ class Role extends Model
     // 角色拥有的资源（权限点、菜单）
     public function resources()
     {
-        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id')->orderBy('sort', 'asc');
+        return $this->belongsToMany(Resource::class, 'role_resources', 'role_id', 'resource_id');
     }
 }

app/common/model/UserFeishuApp_bak.php

@@ -1,69 +0,0 @@
-<?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'
-    ];
-}

app/common/model/UserRoles.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use support\Model;
-
-/**
- * user_roles 用户-角色关联
- * @property integer $user_id 用户ID(主键)
- * @property integer $role_id 角色ID(主键)
- */
-class UserRoles 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_roles';
-
-    /**
-     * The primary key associated with the table.
-     *
-     * @var string
-     */
-    protected $primaryKey = null;
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-    
-    
-    protected $fillable = [
-        'user_id',
-        'role_id'
-    ];
-}

app/common/model/UserSystems.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace app\common\model;
-
-use support\Model;
-
-/**
- * user_systems 用户-系统关联表：描述用户可访问哪些系统
- * @property integer $user_id 用户ID(主键)
- * @property integer $system_id 系统ID(主键)
- * @property integer $created_at 创建时间
- */
-class UserSystems 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_systems';
-
-    /**
-     * The primary key associated with the table.
-     *
-     * @var string
-     */
-    protected $primaryKey = null;
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-    
-    // protected $dateFormat = 'U';
-
-    // const UPDATED_AT = false;
-    
-
-    protected $fillable = [
-        'user_id',
-        'system_id',
-        'created_at'
-    ];
-}