Merge remote-tracking branch 'origin/main'

Resolved conflicts in:
- account-holder-auth-list.tsx
- list-item.tsx
- account-holder-auth-page.tsx

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
HyeonJongKim
2025-11-04 10:33:09 +09:00
9 changed files with 177 additions and 46 deletions

View File

@@ -156,10 +156,6 @@ export const PATHS: RouteNamesType = {
`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderSearch.base}`,
ROUTE_NAMES.additionalService.accountHolderSearch.list
),
detail: generatePath(
`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderSearch.base}`,
ROUTE_NAMES.additionalService.accountHolderSearch.detail
),
request: generatePath(
`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderSearch.base}`,
ROUTE_NAMES.additionalService.accountHolderSearch.request,
@@ -171,10 +167,6 @@ export const PATHS: RouteNamesType = {
`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderAuth.base}`,
ROUTE_NAMES.additionalService.accountHolderAuth.list
),
detail: generatePath(
`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderAuth.base}`,
ROUTE_NAMES.additionalService.accountHolderAuth.detail
),
},
linkPayment: {
base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`),

View File

@@ -78,13 +78,11 @@ export const ROUTE_NAMES = {
accountHolderSearch: {
base: '/account-holder-search/*',
list: 'list',
detail: 'detail',
request: 'request'
},
accountHolderAuth: {
base: '/account-holder-auth/*',
list: 'list',
detail: 'detail'
},
linkPayment: {
base: '/link-payment/*',