Merge branch 'develop'

DSM-PICK · Aug 27, 2024 · 4a2d947 · 4a2d947
2 parents ae67535 + 9ddc817
commit 4a2d947
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/api/type.ts b/src/api/type.ts
@@ -1,13 +1,14 @@
 export interface applicationOK {
   user_id: string;
   username: string;
-  start_time: string;
+  start: string;
   id: string;
-  end_time: string;
+  end: string;
   grade: number;
   class_num: number;
   num: number;
   reason: string;
+  start_time: string;
 }
 
 export interface earlyReturnHome {

diff --git a/src/app/outAccept/page.tsx b/src/app/outAccept/page.tsx
@@ -219,7 +219,7 @@ const OutAccept = () => {
                 id={item.user_id}
                 type="accept"
                 key={index}
-                returnTime={`${item.start_time}~${item.end_time}`}
+                returnTime={`${item.start}~${item.end}`}
                 name={getStudentString(item)}
                 onClick={() => handleAcceptListClick(item.id, item.username)}
                 reason={item.reason}

diff --git a/src/app/outList/page.tsx b/src/app/outList/page.tsx
@@ -103,7 +103,7 @@ const OutList = () => {
                 id={item.id}
                 type="application"
                 key={index}
-                returnTime={item.end_time}
+                returnTime={item.end}
                 name={getStudentString(item)}
                 reason={item.reason}
               />