diff --git a/src/database/data-source.ts b/src/database/data-source.ts
index 006de7e0..ce5ff43c 100644
--- a/src/database/data-source.ts
+++ b/src/database/data-source.ts
@@ -34,9 +34,9 @@ export class MyCustomLogger implements Logger {
 
 export const AppDataSource = new DataSource({
   type: "mysql",
-  extra: {
-    timezone: "Asia/Bangkok", // Set to Bangkok timezone
-  },
+  //   extra: {
+  //     timezone: "Asia/Bangkok", // Set to Bangkok timezone
+  //   },
   database: process.env.DB_NAME,
   host: process.env.DB_HOST,
   port: +(process.env.DB_PORT || 3306),
diff --git a/src/entities/ProfileSalary.ts b/src/entities/ProfileSalary.ts
index 3411ed37..8f7016b3 100644
--- a/src/entities/ProfileSalary.ts
+++ b/src/entities/ProfileSalary.ts
@@ -257,107 +257,122 @@ export class ProfileSalary extends EntityBase {
 
 export class CreateProfileSalary {
   profileId: string | null;
+  commandCode?: string | null;
+  commandNo?: string | null;
+  commandYear?: number | null;
   commandDateAffect?: Date | null;
   commandDateSign?: Date | null;
+  posNoAbb: string | null;
+  posNo: string | null;
+  positionName: string | null;
+  positionType: string | null;
+  positionLevel: string | null;
+  positionLine?: string | null;
+  positionPathSide?: string | null;
+  positionExecutive: string | null;
   amount?: Double | null;
   amountSpecial?: Double | null;
   positionSalaryAmount?: Double | null;
   mouthSalaryAmount?: Double | null;
-  posNo: string | null;
-  posNoAbb: string | null;
-  positionName: string | null;
-  positionExecutive: string | null;
-  positionType: string | null;
-  positionLevel: string | null;
-  commandId?: string | null;
+  orgRootName?: string | null;
+  orgChild1Name?: string | null;
+  orgChild2Name?: string | null;
+  orgChild3Name?: string | null;
+  orgChild4Name?: string | null;
   remark: string | null;
+  commandId?: string | null;
   isGovernment?: boolean | null;
-  orgRoot?: string | null;
-  orgChild1?: string | null;
-  orgChild2?: string | null;
-  orgChild3?: string | null;
-  orgChild4?: string | null;
   positionCee?: string | null;
-  commandCode?: string | null;
   commandName?: string | null;
-  commandNo?: string | null;
-  commandYear?: number | null;
 }
 
 export class CreateProfileSalaryEmployee {
   profileEmployeeId: string | null;
+  commandCode?: string | null;
+  commandNo?: string | null;
+  commandYear?: number | null;
   commandDateAffect?: Date | null;
   commandDateSign?: Date | null;
-  amount?: Double | null;
-  amountSpecial?: Double | null;
-  commandId?: string | null;
-  positionSalaryAmount?: Double | null;
-  mouthSalaryAmount?: Double | null;
-  posNo: string | null;
   posNoAbb: string | null;
+  posNo: string | null;
   positionName: string | null;
   positionType: string | null;
   positionLevel: string | null;
+  positionLine?: string | null;
+  positionPathSide?: string | null;
+  positionExecutive: string | null;
+  amount?: Double | null;
+  amountSpecial?: Double | null;
+  positionSalaryAmount?: Double | null;
+  mouthSalaryAmount?: Double | null;
+  orgRootName?: string | null;
+  orgChild1Name?: string | null;
+  orgChild2Name?: string | null;
+  orgChild3Name?: string | null;
+  orgChild4Name?: string | null;
   remark: string | null;
-  orgRoot?: string | null;
-  orgChild1?: string | null;
-  orgChild2?: string | null;
-  orgChild3?: string | null;
-  orgChild4?: string | null;
+  commandId?: string | null;
+  isGovernment?: boolean | null;
   positionCee?: string | null;
-  commandCode?: string | null;
   commandName?: string | null;
-  commandNo?: string | null;
-  commandYear?: number | null;
 }
 
 export class UpdateProfileSalaryEmployee {
+  commandCode?: string | null;
+  commandNo?: string | null;
+  commandYear?: number | null;
   commandDateAffect?: Date | null;
   commandDateSign?: Date | null;
-  amount?: Double | null;
-  amountSpecial?: Double | null;
-  positionSalaryAmount?: Double | null;
-  mouthSalaryAmount?: Double | null;
-  posNo: string | null;
   posNoAbb: string | null;
+  posNo: string | null;
   positionName: string | null;
   positionType: string | null;
   positionLevel: string | null;
-  remark: string | null;
-  orgRoot?: string | null;
-  orgChild1?: string | null;
-  orgChild2?: string | null;
-  orgChild3?: string | null;
-  orgChild4?: string | null;
-  positionCee?: string | null;
-  commandCode?: string | null;
-  commandName?: string | null;
-  commandNo?: string | null;
-  commandYear?: number | null;
-}
-
-export type UpdateProfileSalary = {
-  commandDateAffect?: Date | null;
-  commandDateSign?: Date | null;
+  positionLine?: string | null;
+  positionPathSide?: string | null;
+  positionExecutive: string | null;
   amount?: Double | null;
   amountSpecial?: Double | null;
   positionSalaryAmount?: Double | null;
   mouthSalaryAmount?: Double | null;
-  posNo?: string | null;
-  posNoAbb: string | null;
-  positionName: string | null;
-  positionExecutive?: string | null;
-  positionType?: string | null;
-  positionLevel?: string | null;
-  remark?: string | null;
-  orgRoot?: string | null;
-  orgChild1?: string | null;
-  orgChild2?: string | null;
-  orgChild3?: string | null;
-  orgChild4?: string | null;
+  orgRootName?: string | null;
+  orgChild1Name?: string | null;
+  orgChild2Name?: string | null;
+  orgChild3Name?: string | null;
+  orgChild4Name?: string | null;
+  remark: string | null;
+  commandId?: string | null;
+  isGovernment?: boolean | null;
   positionCee?: string | null;
-  commandCode?: string | null;
   commandName?: string | null;
+}
+
+export type UpdateProfileSalary = {
+  commandCode?: string | null;
   commandNo?: string | null;
   commandYear?: number | null;
+  commandDateAffect?: Date | null;
+  commandDateSign?: Date | null;
+  posNoAbb: string | null;
+  posNo: string | null;
+  positionName: string | null;
+  positionType: string | null;
+  positionLevel: string | null;
+  positionLine?: string | null;
+  positionPathSide?: string | null;
+  positionExecutive: string | null;
+  amount?: Double | null;
+  amountSpecial?: Double | null;
+  positionSalaryAmount?: Double | null;
+  mouthSalaryAmount?: Double | null;
+  orgRootName?: string | null;
+  orgChild1Name?: string | null;
+  orgChild2Name?: string | null;
+  orgChild3Name?: string | null;
+  orgChild4Name?: string | null;
+  remark: string | null;
+  commandId?: string | null;
+  isGovernment?: boolean | null;
+  positionCee?: string | null;
+  commandName?: string | null;
 };