edit test

@@ -19,6 +19,7 @@ Route::middleware(['web'])->group(function (){  //admin用渲染默认要加上w
             Route::any('/edit', [Aside\User\ProjectUserController::class, 'edit'])->name('admin.user_edit');
             Route::any('/edit', [Aside\User\ProjectUserController::class, 'edit'])->name('admin.user_edit');
             Route::any('/del', [Aside\User\ProjectUserController::class, 'del'])->name('admin.user_del');
             Route::any('/del', [Aside\User\ProjectUserController::class, 'del'])->name('admin.user_del');
 
 
+<<<<<<< HEAD
             //角色管理
             //角色管理
             Route::prefix('role')->group(function () {
             Route::prefix('role')->group(function () {
                 Route::any('/', [Aside\User\ProjectRoleController::class, 'lists'])->name('admin.role_lists');
                 Route::any('/', [Aside\User\ProjectRoleController::class, 'lists'])->name('admin.role_lists');
@@ -159,6 +160,10 @@ Route::middleware(['web'])->group(function (){  //admin用渲染默认要加上w
 
 
 
 
     });
     });
+=======
+    //test
+});
+>>>>>>> e8b7473586b495d76259f651e32d92ac8eb9f92f
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组
     Route::group([], function () {
     Route::group([], function () {