Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop

This commit is contained in:
moss 2025-04-01 03:02:04 +07:00
commit 82e0649cb5

View file

@ -822,6 +822,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId,
positionNameNew = p.position,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1047,6 +1050,9 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
positionTypeNew = p.posTypeId,
positionLevelNew = p.posLevelId,
positionNameNew = p.position,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];