Merge branch 'adiDev' into develop

src/entities/Salarys.ts

@@ -61,6 +61,12 @@ export class Salarys extends EntityBase {
   })
   details: string;
 
+  @Column({
+    comment: "ฉ",
+    default: false,
+  })
+  isSpecial: boolean;
+
   @OneToMany(() => SalaryRanks, (salaryRanks) => salaryRanks.salarys_)
   salaryRanks_: SalaryRanks[];
 
@@ -98,7 +104,9 @@ export class CreateSalary {
 
   @Column()
   details?: string;
-  
+
+  @Column()
+  isSpecial: boolean;
 }
   
 export type UpdateSalary = Partial<CreateSalary> ;