Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/hr/SalaryManagement/index.tsx
#	src/components/production/WorkResults/WorkResultList.tsx
#	tsconfig.tsbuildinfo
This commit is contained in:
2026-01-16 15:47:13 +09:00
91 changed files with 21969 additions and 20128 deletions

View File

@@ -69,7 +69,7 @@ export async function refreshMenus(): Promise<RefreshMenuResult> {
const currentHash = getCurrentMenuHash();
// 2. API에서 새 메뉴 받아오기
const response = await fetch('/api/menus', {
const response = await fetch('/api/proxy/menus', {
method: 'GET',
headers: {
'Content-Type': 'application/json',
@@ -138,7 +138,7 @@ export async function refreshMenus(): Promise<RefreshMenuResult> {
*/
export async function forceRefreshMenus(): Promise<RefreshMenuResult> {
try {
const response = await fetch('/api/menus', {
const response = await fetch('/api/proxy/menus', {
method: 'GET',
headers: {
'Content-Type': 'application/json',