合并代码

Change-Id: Id5e0dc4f7b448b4ba615243bf1dfa964907f5d68
diff --git a/Merge/front/package.json b/Merge/front/package.json
index 54a8783..5f6553c 100644
--- a/Merge/front/package.json
+++ b/Merge/front/package.json
@@ -4,6 +4,7 @@
   "private": true,
   "dependencies": {
     "@testing-library/dom": "^10.4.0",
+    "@emotion/react": "^11.14.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^13.5.0",
@@ -14,8 +15,16 @@
     "web-vitals": "^2.1.4",
     "lucide-react": "^0.468.0",
     "antd": "^4.24.0",
+    "ajv": "^8.0.0",
+    "ajv-keywords": "^5.0.0",
     "crypto-js": "^4.2.0",
-    "recharts": "^2.1.9"
+    "recharts": "^2.1.9",
+    "mui": "^0.0.1",
+    "@mui/material": "^7.1.1",
+    "react-icons": "^5.5.0",
+    "@mui/icons-material": "^7.1.1",
+    "@emotion/styled": "^11.14.0",
+    "axios": "^1.9.0"
   },
   "scripts": {
     "start": "react-scripts start",