Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/14_KPI/interface/request/Main.ts

src/modules/14_KPI/interface/request/Main.ts

@@ -52,4 +52,19 @@ interface ListGroup{
   id:string
   nameGroupKPI:string
 }
-export type { FormQueryRound, FormRound, FormCompetency, FormDataRole,NewPagination,ListGroup };
+
+interface FormQueryCapacity {
+  page: number;
+  pageSize: number;
+  keyword: string;
+}
+
+export type {
+  FormQueryRound,
+  FormRound,
+  FormCompetency,
+  FormDataRole,
+  NewPagination,
+  FormQueryCapacity,
+  ListGroup
+};

src/modules/14_KPI/interface/response/Main.ts

@@ -11,4 +11,19 @@ interface ResRound {
   startDate: Date;
 }
 
-export type { ResRound };
+interface ResDataCapacity {
+  description: string;
+  id: string;
+  name: string;
+  type: string;
+  capacityDetails: capacityDetails;
+}
+
+interface capacityDetails {
+  capacityId: string;
+  description: string;
+  id: string;
+  level: string;
+}
+
+export type { ResRound, ResDataCapacity };