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

This commit is contained in:
Suphonchai Phoonsawat 2024-12-10 12:48:40 +07:00
commit 426239e8d8

View file

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