checkpoint

src/entities/OrgChild2.ts

@@ -83,29 +83,29 @@ export class OrgChild2 extends EntityBase {
 
   @Column({
     nullable: true,
-    type: "tinyint",
     comment: "สถานะของหน่วยงาน", //ปกติ = 1 , ยุกเลิก = 0
+    default: true 
   })
-  orgChild2IsNormal: number;
+  orgChild2IsNormal: boolean;
 
   @Column({
     length: 40,
     default: "00000000-0000-0000-0000-000000000000",
   })
-  fkOrgRootId: string;
+  orgRootId: string;
 
   @Column({
     length: 40,
     default: "00000000-0000-0000-0000-000000000000",
   })
-  fkOrgChild1Id: string;
+  orgChild1Id: string;
 
   // @ManyToOne(() => OrgRoot, orgRoot => orgRoot.orgChild2s)
-  // @JoinColumn({ name: "fkOrgRootId" })
+  // @JoinColumn({ name: "orgRootId" })
   // orgRoot: OrgRoot;
 
   @ManyToOne(() => OrgChild1, orgChild1 => orgChild1.orgChild2s)
-  @JoinColumn({ name: "fkOrgChild1Id" })
+  @JoinColumn({ name: "orgChild1Id" })
   orgChild1: OrgChild1;
 
   //child table 3,4