From 4d160b5d7bc6fe415c2b320ec0320c0c13dc3f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=B3=B4=EA=B3=A4?= Date: Thu, 12 Mar 2026 14:39:00 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20[hr]=20=EC=9B=94=20=EA=B3=A0=EC=A0=95?= =?UTF-8?q?=EC=97=B0=EC=9E=A5=EA=B7=BC=EB=A1=9C=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EC=B5=9C=EB=8C=80=EA=B0=92=2052=EC=8B=9C=EA=B0=84=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=9C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/Admin/HR/EmployeeSalaryController.php | 2 +- resources/views/hr/employees/partials/salary-info.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/Admin/HR/EmployeeSalaryController.php b/app/Http/Controllers/Api/Admin/HR/EmployeeSalaryController.php index 76a4b543..d6c4324f 100644 --- a/app/Http/Controllers/Api/Admin/HR/EmployeeSalaryController.php +++ b/app/Http/Controllers/Api/Admin/HR/EmployeeSalaryController.php @@ -62,7 +62,7 @@ public function update(Request $request, int $id): JsonResponse $validated = $request->validate([ 'annual_salary' => 'nullable|integer|min:0', 'meal_allowance' => 'nullable|integer|min:0|max:1000000', - 'fixed_overtime_hours' => 'nullable|integer|min:0|max:100', + 'fixed_overtime_hours' => 'nullable|integer|min:0|max:52', 'effective_date' => 'nullable|date', 'notes' => 'nullable|string|max:500', ]); diff --git a/resources/views/hr/employees/partials/salary-info.blade.php b/resources/views/hr/employees/partials/salary-info.blade.php index be157734..35050cad 100644 --- a/resources/views/hr/employees/partials/salary-info.blade.php +++ b/resources/views/hr/employees/partials/salary-info.blade.php @@ -166,7 +166,7 @@ class="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:rin

변동값 (사원별 상이)