Merge branch 'develop' into feature/user0812

# Conflicts: # app/admin/service/UserService.php # config/route.php
2025-08-14 10:09:56 +08:00
parent d78567e780 f8da1a1a4b
commit f326665716
19 changed files with 881 additions and 277 deletions
@@ -27,6 +27,6 @@ class RoleValidate extends Validate

    protected $scene = [
        'store' => ['name', 'desc', 'sort'],
-        'update' => ['id', 'system_id', 'name', 'desc', 'sort', 'status'],
+        'update' => ['id', 'name', 'desc', 'sort', 'status'],
    ];
 }