hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-12-10 12:48:40 +07:00
commit 426239e8d8
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/CommandController.ts
View file

@ -439,6 +439,7 @@ export class CommandController extends Controller {
remarkVertical: x.remarkVertical, remarkVertical: x.remarkVertical,
remarkHorizontal: x.remarkHorizontal, remarkHorizontal: x.remarkHorizontal,
amount: x.amount, amount: x.amount,
amountSpecial: x.amountSpecial,
positionSalaryAmount: x.positionSalaryAmount, positionSalaryAmount: x.positionSalaryAmount,
mouthSalaryAmount: x.mouthSalaryAmount, mouthSalaryAmount: x.mouthSalaryAmount,
})), })),
@ -542,6 +543,7 @@ export class CommandController extends Controller {
remarkVertical: string | null; remarkVertical: string | null;
remarkHorizontal: string | null; remarkHorizontal: string | null;
amount: Double | null; amount: Double | null;
amountSpecial: Double | null;
positionSalaryAmount: Double | null; positionSalaryAmount: Double | null;
mouthSalaryAmount: Double | null; mouthSalaryAmount: Double | null;
}, },