Merge branch 'develop' into adiDev

src/entities/ProfileAvatar.ts

@@ -12,6 +12,12 @@ export class ProfileAvatar extends EntityBase {
   })
   avatar: string;
 
+  @Column({
+    comment: "สถานะการใช้งาน",
+    default: false,
+  })
+  isActive: boolean;
+
   @Column({
     nullable: true,
     comment: "รูปถ่าย",

src/entities/ProfileDiscipline.ts

@@ -15,6 +15,7 @@ export class ProfileDiscipline extends EntityBase {
   date: Date;
 
   @Column({
+    nullable: true,
     length: 40,
     comment: "ไอดีโปรไฟล์",
     type: "uuid",

src/entities/ProfileSalaryEmployee.ts

@@ -222,11 +222,11 @@ export class ProfileSalaryEmployee extends EntityBase {
   })
   order: number;
 
-  @Column({
-    comment: "เลขที่คำสั่ง",
-    type: "text",
-  })
-  commandNo: string;
+  // @Column({
+  //   comment: "เลขที่คำสั่ง",
+  //   type: "text",
+  // })
+  // commandNo: string;
 
   @Column({
     comment: "ประเภทคำสั่ง",