Merge remote-tracking branch 'origin/master'

src/Controllers/PermissionController.php

@@ -7,9 +7,9 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Row;
-use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Models\Repositories\Permission;
 use Dcat\Admin\Show;
+use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Tree;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Str;

src/Controllers/RoleController.php

@@ -7,10 +7,10 @@ use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Models\Repositories\Role;
 use Dcat\Admin\Models\Role as RoleModel;
 use Dcat\Admin\Show;
+use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Routing\Controller;
 

src/Controllers/UserController.php

@@ -7,10 +7,10 @@ use Dcat\Admin\Auth\Permission;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
-use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Models\Administrator as AdministratorModel;
 use Dcat\Admin\Models\Repositories\Administrator;
 use Dcat\Admin\Show;
+use Dcat\Admin\SimpleGrid;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Widgets\Tree;
 use Illuminate\Routing\Controller;