Merge remote-tracking branch 'origin/sub_laptop_1' into main_laptop_1

충돌(Labor_Detail.ts 한 줄) = 같은 식 · 주석 붙은 쪽(sub1) 취함
This commit is contained in:
2026-10-05 19:09:26 +09:00
14 changed files with 464 additions and 36 deletions
@@ -118,6 +118,7 @@ const TEXT = {
In_Ok: ["확인", "OK"],
In_Cancel: ["취소", "Cancel"],
In_Close: ["닫기", "Close"],
Lib_Name: ["이름", "Name"],
} as const satisfies Record<string, readonly [string, string]>;
export type ComboTextKey = keyof typeof TEXT;