From 92dc7b19a98986d90dc616108cc639f7b94948b1 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Thu, 17 Jul 2025 10:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/route.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/route.php b/config/route.php
index 8ff4261..413f864 100644
--- a/config/route.php
+++ b/config/route.php
@@ -64,10 +64,7 @@ Route::group('/ticket', function () {
     Route::any('/ticket/add', [app\ticket\controller\TicketController::class, 'add']);
     Route::any('/ticket/edit', [app\ticket\controller\TicketController::class, 'edit']);
     Route::any('/ticket/list', [app\ticket\controller\TicketController::class, 'index']);
-<<<<<<< HEAD
     Route::any('/ticket/self', [app\ticket\controller\TicketController::class, 'self']);
-=======
->>>>>>> feature/crmAdmin0715
     Route::any('/ticket/status', [app\ticket\controller\TicketController::class, 'status']);
     Route::any('/ticket/getStatus', [app\ticket\controller\TicketController::class, 'getStatus']);