Merge branch 'develop' into nice_dev

# Conflicts:
#	src/api/11_discipline/api.discipline.ts

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

@@ -2,6 +2,12 @@ interface DataOption {
   id: string;
   name: string;
 }
+interface DataOptioGroup {
+  id: string;
+  name: string;
+
+  disable: Boolean;
+}
 
 interface DataNumberOption {
   id: number;
@@ -71,4 +77,5 @@ export type {
   DataNumberOption,
   responseType,
   FileLists,
+  DataOptioGroup,
 };