Merge branch 'develop' into adiDev

2025-04-28 14:46:16 +07:00 · 2025-04-28 14:46:16 +07:00 · 519de90743
commit 519de90743
parent 4da32eb5ef 1eadad89da
6 changed files with 1748 additions and 81 deletions
--- a/src/entities/ProfileSalaryHistory.ts
+++ b/src/entities/ProfileSalaryHistory.ts
@ -212,6 +212,22 @@ export class ProfileSalaryHistory extends EntityBase {
  })
  commandId: string;

+  @Column({
+    nullable: true,
+    length: 255,
+    comment: "หน่วยงานที่ออกคำสั่ง",
+    default: null,
+  })
+  posNumCodeSit: string;
+
+  @Column({
+    nullable: true,
+    length: 255,
+    comment: "หน่วยงานที่ออกคำสั่ง(ตัวย่อ)",
+    default: null,
+  })
+  posNumCodeSitAbb: string;
+
  @ManyToOne(() => Command, (command) => command.profileSalaryHistorys)
  @JoinColumn({ name: "commandId" })
  command: Command;