Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s

This commit is contained in:
Adisak 2025-11-25 17:14:39 +07:00
commit 72916bd518

View file

@ -952,7 +952,7 @@ export class SalaryPeriodEmployeeController extends Controller {
salaryProfile.remark = body.remark == null ? _null : body.remark;
let type = salaryProfile.type;
salaryProfile = await this.calSalary(type, salaryProfile);
salaryProfile = await this.calSalaryNew(type, salaryProfile);
salaryProfile.lastUpdateUserId = req.user.sub;
salaryProfile.lastUpdateFullName = req.user.name;