Merge branch 'master' into master_api_test개발

# Conflicts:
#	src/app/[locale]/(protected)/sales/pricing-management/page.tsx
This commit is contained in:
2025-12-23 16:36:21 +09:00
50 changed files with 664 additions and 244 deletions

View File

@@ -94,7 +94,7 @@ async function getApiHeaders(): Promise<HeadersInit> {
'Accept': 'application/json',
'Content-Type': 'application/json',
'Authorization': token ? `Bearer ${token}` : '',
'X-API-KEY': process.env.NEXT_PUBLIC_API_KEY || '',
'X-API-KEY': process.env.API_KEY || '',
};
}