diff --git a/nginx.conf b/nginx.conf
index 9dac2b1..7057dbd 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -2,13 +2,8 @@
     listen 80;
     server_name team12.10813352.xyz;  # 替换为你的域名
 
-<<<<<<< HEAD
-    location /api {
-        proxy_pass http://localhost:12138/;
-=======
     location /api/ {
-        proxy_pass http://localhost:12138;
->>>>>>> 0321331 (修改nginx.conf，修改映射路径)
+        proxy_pass http://localhost:8080;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;