Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

# Conflicts:
#	src/controllers/ImportDataController.ts

src/entities/AmphurImport.ts

@@ -0,0 +1,26 @@
+import { Entity, Column} from "typeorm";
+import { EntityBase } from "./base/Base";
+
+@Entity("amphurImport")
+export class AmphurImport extends EntityBase{
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  PROVINCE_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  AMPHUR_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  AMPHUR_NAME: string;
+}

src/entities/EducationMis.ts

@@ -0,0 +1,26 @@
+import { Entity, Column} from "typeorm";
+import { EntityBase } from "./base/Base";
+
+@Entity("educationMis")
+export class EducationMis extends EntityBase{
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  EDUCATION_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  EDUCATION_NAME: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  EDUCATION_ABB_NAME: string;
+}

src/entities/ProvinceImport.ts

@@ -0,0 +1,19 @@
+import { Entity, Column} from "typeorm";
+import { EntityBase } from "./base/Base";
+
+@Entity("provinceImport")
+export class ProvinceImport extends EntityBase{
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  PROVINCE_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  PROVINCE_NAME: string;
+}

src/entities/SubDistrictImport.ts

@@ -0,0 +1,33 @@
+import { Entity, Column} from "typeorm";
+import { EntityBase } from "./base/Base";
+
+@Entity("subDistrictImport")
+export class SubDistrictImport extends EntityBase{
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  PROVINCE_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  AMPHUR_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  DISTRICT_CODE: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    default: null,
+  })
+  DISTRICT_NAME: string;
+}