Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/18_command/interface/request/Main.ts
This commit is contained in:
STW_TTTY\stwtt 2024-09-25 17:50:33 +07:00
commit 6658ae63a2
43 changed files with 1582 additions and 2652 deletions

View file

@ -24,6 +24,7 @@ interface FormDataDetail {
commandExcecuteDate: Date | null;
commandSysId?: string;
commandTypeName?: string;
isBangkok?: boolean;
}
interface ListCommandSalaryType {
@ -48,8 +49,13 @@ interface PersonInfo {
remarkHorizontal: string | null;
amount: number;
positionSalaryAmount: number;
mouthSalaryAmount: number;
mouthSalaryAmount: number;
}
export type { FormQuery, FormCommand, FormDataDetail, ListCommandSalaryType ,PersonInfo};
export type {
FormQuery,
FormCommand,
FormDataDetail,
ListCommandSalaryType,
PersonInfo,
};