更新路由

app/Admin/routes.php

@@ -17,13 +17,9 @@ Route::group([
     $router->resource('/organizations', OrganizationController::class);
     $router->resource('/docters', DocterController::class);
     $router->resource('/qualifications', QualificationController::class);
-<<<<<<< HEAD
     $router->resource('/docters_approve', ApproveController::class);
-=======
     $router->resource('banners', BannerController::class);
     $router->resource('servebanners', ServebannerController::class);
     $router->resource('articles', ArticleController::class);
-
->>>>>>> f6598919be02794e81b2d06342443f241af8462a
 });