合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2791

@@ -145,9 +145,9 @@ class AsideTicketController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
             $manageModel = new Manage();
             foreach ($lists['list'] as $key => $item){
-//                if($item['project']['version'] != 5){
-//                    $item['project_id']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
-//                }
+                if($item['project']['version'] != 5){
+                    $item['project']['engineer_id_name'] = $manageModel->getName($item['project']['engineer_id'] ?? 0);
+                }
                 //计算超时多少个小时
                 if($item['status'] == 0){
                     $end = date('Y-m-d H:i:s');

@@ -252,7 +252,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/getUserTaskList', [Aside\Task\TaskController::class, 'getUserTaskList'])->name('admin.task_getUserTaskList');
     });
     // 售后工单改版
-    Route::prefix('tickets')->group(function () {
+    Route::prefix('ticketstickets')->group(function () {
         Route::get('/', [Aside\WorkOrder\AsideTicketController::class, 'index'])->name('admin.tickets.index')->summary('A端工单列表');
         Route::post('/lists', [Aside\WorkOrder\AsideTicketController::class, 'lists'])->name('admin.tickets.lists')->summary('A端工单列表2');
         Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');