Fix bad git pull merge
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
parent
fef3dfa605
commit
dfed211578
|
@ -52,24 +52,6 @@ export default {
|
||||||
},
|
},
|
||||||
component: () => import('src/pages/Ticket/TicketCreate.vue'),
|
component: () => import('src/pages/Ticket/TicketCreate.vue'),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'TicketAdvance',
|
|
||||||
path: 'advance',
|
|
||||||
meta: {
|
|
||||||
title: 'ticketAdvance',
|
|
||||||
icon: 'keyboard_double_arrow_left',
|
|
||||||
},
|
|
||||||
component: () => import('src/pages/Ticket/TicketAdvance.vue'),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'TicketAdvance',
|
|
||||||
path: 'advance',
|
|
||||||
meta: {
|
|
||||||
title: 'ticketAdvance',
|
|
||||||
icon: 'keyboard_double_arrow_left',
|
|
||||||
},
|
|
||||||
component: () => import('src/pages/Ticket/TicketAdvance.vue'),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: 'weekly',
|
path: 'weekly',
|
||||||
name: 'TicketWeekly',
|
name: 'TicketWeekly',
|
||||||
|
@ -89,8 +71,8 @@ export default {
|
||||||
component: () => import('src/pages/Ticket/TicketFuture.vue'),
|
component: () => import('src/pages/Ticket/TicketFuture.vue'),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'advance',
|
|
||||||
name: 'TicketAdvance',
|
name: 'TicketAdvance',
|
||||||
|
path: 'advance',
|
||||||
meta: {
|
meta: {
|
||||||
title: 'ticketAdvance',
|
title: 'ticketAdvance',
|
||||||
icon: 'keyboard_double_arrow_left',
|
icon: 'keyboard_double_arrow_left',
|
||||||
|
|
Loading…
Reference in New Issue