hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into nice_dev

Browse source 
# Conflicts:
#	src/modules/06_retirement/components/DismissOrder/DismissOrder.vue
#	src/modules/06_retirement/router.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-07-25 14:13:03 +07:00
commit 1484c9288d
5 changed files with 230 additions and 409 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/06_retirement/router.ts
View file

@ -92,8 +92,8 @@ export default [
},
},
{
path: "/dismiss-order/add-order",
name: "dismiss-order-add-order",
path: "/dismiss-order/add",
name: "dismiss-order-add",
component: addOrder,
meta: {
Auth: true,