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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
kittapath 2024-10-21 14:34:02 +07:00
commit 835b0ce337
12 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -740,6 +740,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
@ -891,6 +892,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,

1
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -528,6 +528,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,

3
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -1762,6 +1762,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
@ -1859,6 +1860,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,
@ -2001,6 +2003,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId,
date = r.commandAffectDate,
amount = r.amount,
commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.PositionNumberOld,