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

# Conflicts:
#	src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue

src/interface/request/main/main.ts

@@ -195,16 +195,16 @@ const menuList = readonly<any[]>([
   },
   {
     key: 7,
-    icon: "mdi-home-variant-outline",
-    activeIcon: "mdi-home-variant",
+    icon: "mdi-account-cancel-outline",
+    activeIcon: "mdi-account-cancel",
     label: "พ้นจากราชการ",
     path: "retirement",
     role: "retirement",
   },
   {
     key: 8,
-    icon: "mdi-home-variant-outline",
-    activeIcon: "mdi-home-variant",
+    icon: "mdi-medal-outline",
+    activeIcon: "mdi-medal",
     label: "เครื่องราชอิสริยาภรณ์",
     path: "insignia",
     role: "insignia",