Merge branch 'develop' into devTee

# Conflicts:
#	src/api/14_KPI/api.KPI.ts

src/api/14_KPI/api.KPI.ts

@@ -2,7 +2,7 @@ import env from "../index";
 const KPI = `${env.API_URI}/kpi`;
 const kpiPeriod = `${env.API_URI}/kpi/period`;
 const kpiEvaluation = `${env.API_URI}/kpi/evaluation`;
-
+const kpiGroup = `${env.API_URI}/kpi/group`;
 export default {
   KPI,
   /** รอบการประเมินผล*/
@@ -12,5 +12,9 @@ export default {
 
 
   /** role */
-  kpiRoleMainList:`${KPI}/role`
+  kpiRoleMainList:`${KPI}/role`,
+
+  
+  kpiGroup,
+  kpiGroupById: (id: string) => `${kpiGroup}/${id}`
 };