Merge develop and fix conflicts in routes/web.php (AI config and Categories)

routes/web.php

@@ -29,6 +29,7 @@
 use App\Http\Controllers\TenantSettingController;
 use App\Http\Controllers\CommonCodeController;
 use App\Http\Controllers\DocumentTemplateController;
+use App\Http\Controllers\CategoryController;
 use App\Http\Controllers\MenuSyncController;
 use App\Http\Controllers\UserController;
 use Illuminate\Support\Facades\Route;
@@ -331,6 +332,9 @@
     // 명함 OCR API
     Route::post('/api/business-card-ocr', [BusinessCardOcrController::class, 'process'])->name('api.business-card-ocr');
 
+    // 카테고리 관리
+    Route::get('/categories', [CategoryController::class, 'index'])->name('categories.index');
+
     /*
     |--------------------------------------------------------------------------
     | 바로빌 Routes