Merge branch 'dev/phatt' into develop

This commit is contained in:
puriphatt 2024-04-09 14:39:56 +07:00
commit 88ca3e0e14
2 changed files with 7 additions and 5 deletions

View file

@ -26,6 +26,7 @@ export type Branch = {
name: string;
taxNo: string;
id: string;
code: string;
};
export type BranchCreate = {

View file

@ -38,6 +38,7 @@ export type User = {
keycloakId: string;
id: string;
profileImageUrl: string;
code: string;
};
export type UserCreate = {
@ -53,12 +54,12 @@ export type UserCreate = {
trainingPlace?: string;
importNationality?: string;
sourceNationality?: string;
licenseExpireDate?: Date;
licenseIssueDate?: Date;
licenseExpireDate?: Date | null;
licenseIssueDate?: Date | null;
licenseNo?: string;
discountCondition?: string;
retireDate?: Date;
startDate?: Date;
retireDate?: Date | null;
startDate?: Date | null;
registrationNo?: string;
lastNameEN: string;
lastName: string;
@ -67,5 +68,5 @@ export type UserCreate = {
userRole: string;
userType: string;
keycloakId: string;
profileImage: File;
profileImage?: File;
};