Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts: # src/modules/08_registryEmployee/views/Main.vue
2023-07-07 15:30:24 +07:00 · 2023-07-07 15:30:24 +07:00 · e72f86e1d4
commit e72f86e1d4
parent 1e02f42b58 27a1ca209d
6 changed files with 297 additions and 711 deletions
--- a/src/modules/08_registryEmployee/router.ts
+++ b/src/modules/08_registryEmployee/router.ts
@ -14,7 +14,7 @@ const Detail = defineAsyncComponent(

 export default [
  {
-    path: "/registryEmployee",
+    path: "/registry-employee",
    name: "registryEmployee",
    component: Main,
    meta: {