Merge branch 'main' of https://github.com/Moujuruo/AI_Office into unf…

…inished_test
Moujuruo · Jun 7, 2024 · 0b1889f · 0b1889f
2 parents bea1a99 + c855c92
commit 0b1889f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/backend/run_app.py b/backend/run_app.py
@@ -163,6 +163,7 @@ def insertActivity():
         return json.dumps(re)
     except Exception as e:
         return json.dumps({'code': -4, 'message': str(e)}), 500
+        return json.dumps({'code': -4, 'message': str(e)}), 500
 
 @app.route(apiPrefix + 'getActivityList/<int:job>')
 def getActivityList(job):

diff --git a/frontend/src/pages/Reservation/MyReservation.tsx b/frontend/src/pages/Reservation/MyReservation.tsx
@@ -4,11 +4,7 @@ import moment from 'moment';
 import dayjs from 'dayjs';
 import HttpUtil from '../../utils/HttpUtil';
 import ApiUtil from '../../utils/ApiUtil';
-
-interface ApiResponse<T> {
-  status: number;
-  data: T;
-}
+import { ApiResponse } from "../../utils/ApiUtil";
 
 interface Reservation {
   id: number;