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

Merge branch 'nice_dev' into develop

Browse source 
# Conflicts:
#	src/api/registry/api.registry.ts
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-03-27 13:55:02 +07:00
commit 62b5651911
4 changed files with 273 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/04_registryNew/interface/request/Salary.ts
View file

@ -3,14 +3,14 @@ interface FormSalaryNew {
posNo: string;
templatePos: string;
position: string;
positionLineName: string;
typePosition: string;
levelPosition: string;
positionPathSideName: string;
positionExecutiveName: string;
salary: number | null;
salaryPos: number | null;
salaryCompensation: number | null;
positionLine: string;
positionPathSide: string;
positionType: string;
positionLevel: string;
positionExecutive: string;
salary: number | string | null;
salaryPos: number | string | null;
salaryCompensation: number | string | null;
refCommandNo: string;
templateDoc: string;
doc: string;