Merge branch 'develop' into warunee-dev

# Conflicts:
#	src/modules/11_discipline/router.ts

src/modules/11_discipline/interface/index/Main.ts

@@ -1,7 +1,68 @@
 interface DataOption {
-    id: string;
-    name: string;
+  id: string;
+  name: string;
 }
+interface investigatefactsDataRowType {
+  subject: string;
+  interrogated: string;
+  fault: string;
+  status: string;
+  active: string;
+}
+interface MyObjectRef {
+  orderType: any;
+  orderBy: any;
+  listInvestigation: any;
+  authority: any;
+  orderNumber: any;
+  dateYear: any;
+  date: any;
+  authorityPosition: any;
+  subject: any;
+  mistakeDetail: any;
+  [key: string]: any;
+}
+interface MyObjectComplaintsRef {
+  complainantType: any;
+  complainant: any;
+  office: any;
+  agency: any;
+  topicComplaint: any;
+  datereceive: any;
+  dateconsideration: any;
+  offenseDescription: any;
+  considerationLevel: any;
+  datewarn: any;
+  receivecomplaints: any;
+  petitioner: any;
+  files: any;
+  [key: string]: any;
+}
+
+interface investigateDisDataRowType {
+  subject: string;
+  interrogated: string;
+  fault: string;
+  penaltyLevel: string;
+  caseFault: string;
+  dateInvestigate: string;
+  status: string;
+  active: string;
+}
+
+interface directorType {
+  nameDirector: string;
+  position: string;
+  duty: string;
+  email: string;
+  telephone: string;
+}
+
 export type {
-    DataOption
+  DataOption,
+  investigatefactsDataRowType,
+  MyObjectRef,
+  MyObjectComplaintsRef,
+  investigateDisDataRowType,
+  directorType,
 };