From 5c6abbe412404563db7e5b116a1ba875f4debc0a Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Mon, 8 Jul 2024 17:46:32 +0700
Subject: [PATCH] fix

---
 src/controllers/ReportController.ts | 3 ++-
 src/entities/SalaryProfile.ts       | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index da08fcb..0e0c079 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -2302,7 +2302,7 @@ export class ReportController extends Controller {
       },
       relations: ["salaryProfiles"],
     });
-
+   
     const salaryProfileSpecial = await this.salaryProfileRepository.find({
       relations: ["salaryOrg"],
       where: {
@@ -2322,6 +2322,7 @@ export class ReportController extends Controller {
         "posMasterNo",
         "amount",
         "amountSpecial",
+        "remark",
       ],
       order: {
         salaryOrg: {
diff --git a/src/entities/SalaryProfile.ts b/src/entities/SalaryProfile.ts
index 071657b..5eb66b4 100644
--- a/src/entities/SalaryProfile.ts
+++ b/src/entities/SalaryProfile.ts
@@ -436,4 +436,7 @@ export class CreateSalaryProfile {
 
   @Column()
   isSpecial: boolean;
+
+  @Column()
+  remark: string | null;
 }