Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/09_leave/components/2_Leave/DetailLeave.vue
This commit is contained in:
setthawutttty 2023-11-03 18:01:38 +07:00
commit 5d34c40b41
11 changed files with 257 additions and 148 deletions

View file

@ -1,11 +1,10 @@
interface DataRows {
id: string;
fullname: string | null;
date: string | null;
dateFix: string | null;
type: string;
reason: string;
timeStamp: string;
unapprove?: string; // Make these properties optional
approve?: string;
timeMorning: string;
timeAfternoon: string;
status: string;
}
export type { DataRows };