Merge branch 'develop'

2025-07-29 09:00:04 +08:00
parent a551507e4d
commit d74b374198
106 changed files with 6754 additions and 1346 deletions
@@ -43,6 +43,14 @@ class Role extends Model
    public $timestamps = true;

    protected $dateFormat = 'U';
+
+    protected $fillable = [
+        'system_id',
+        'name',
+        'desc',
+        'sort',
+        'status'
+    ];
    
    // 角色下所有用户
    public function users()
@@ -53,6 +61,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');
    }
 }