Merge branch 'develop' into dev-tee

# Conflicts:
#	src/modules/05_placement/router.ts

src/modules/05_placement/router.ts

@@ -37,6 +37,14 @@ const probationWorkAdd = () =>
     import("@/modules/05_placement/components/probation/FormAssign.vue");
   const transfer = () =>
     import("@/modules/05_placement/components/Transfer/transferMain.vue");
+
+
+  // คำสั่งช่วยราชการ/ส่งตัวกลับ
+  const RepatriationOrder = () =>
+  import("@/modules/05_placement/components/RepatriationOrder/List.vue");
+  const RepatriationOrderAdd = () =>
+  import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue");
+
   export default [
     {
       path: "/placement",
@@ -166,6 +174,26 @@ const probationWorkAdd = () =>
         Auth: true,
         Key: [6.4],
         Role: "placement",
+      }
+    },
+    {
+      path: "/repatriation-order",
+      name: "repatriation-order",
+      component: RepatriationOrder,
+      meta: {
+        Auth: true,
+        Key: [6.6],
+        
+      },
+    },
+    {
+      path: "/repatriation-order/add",
+      name: "repatriation-order-add",
+      component: RepatriationOrderAdd,
+      meta: {
+        Auth: true,
+        Key: [6.6],
+        Role: "placement",
       },
     },
   ];