Merge branch 'develop' of github.com:Frappet/hrms-mgt into develop

src/api/11_discipline/api.discipline.ts

@@ -120,7 +120,7 @@ export default {
   historyDirectorbyId: (id: string, type: string) =>
     `${disciplineMain}/director/${type}/${id}`,
   historyOrderById: (id: string) =>
-    `${env.API_URI}/order/history/discipline/${id}`,
+    `${env.API_URI}/discipline/result/order/history/${id}`,
 
   complaintbyGetId: (id: string, page?: string) =>
     `${disciplineMain}/complaint/${page}/${id}`,