Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 50s
This commit is contained in:
commit
72916bd518
1 changed files with 1 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue