Merge branch 'feature/merge' into develop

app/common/logic/PermLogic.php

@@ -29,7 +29,6 @@ class PermLogic
             $resources = Resource::where('id', $resources_id)->get();
             $all = $all->merge($resources);
         }
-        return $all->unique('id')->values()->sortBy('sort');
 
         // 遍历用户的所有角色，合并每个角色所拥有的资源
         foreach ($user->roles as $role) {