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

# Conflicts:
#	src/api/06_retirement/api.retirement.ts
#	src/modules/05_placement/router.ts

src/modules/05_placement/interface/response/officer.ts

@@ -0,0 +1,23 @@
+interface officerType {
+    no:number,
+    id: string,
+    prefix: string,
+    firstName: string,
+    lastName: string,
+    position: string,
+    posNo: string,
+    positionLevel: string,
+    createdAt: Date,
+    organization: string,
+    reason: string,
+    status: string,
+    date: Date,
+    salary: number,
+    positionTypeOld: string,
+    positionLevelOld: string,
+    positionNumberOld: string,
+    organizationPositionOld: string,
+    isActive: true
+}
+
+export type { officerType};