Merge branch 'develop' into adiDev

2024-02-28 16:28:17 +07:00 · 2024-02-28 16:28:17 +07:00 · 6fd1a8170e
commit 6fd1a8170e
parent 95c4321c5d 442f2f9a86
11 changed files with 212 additions and 69 deletions
--- a/src/entities/SalaryOrg.ts
+++ b/src/entities/SalaryOrg.ts
@ -37,11 +37,13 @@ export class SalaryOrg extends EntityBase {
  snapshot: string;

  @Column({
+    default: 0,
    comment: "จำนวนคนทั้งหมด",
  })
  total: number;

  @Column({
+    default: 0,
    comment: "15%ของจำนวนคน(จำนวนเต็ม)",
  })
  fifteenPercent: number;