merge conflict

Change-Id: I4c784028cd7aa8e612563eac0fce3dda91631638
diff --git a/nginx.conf b/nginx.conf
index a2b5e67..8673316 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -4,6 +4,7 @@
 
 server {
     listen 3004;  # 修改为Docker Compose中映射的前端端口(与docker-compose.yml保持一致)
+
     server_name _;  # 允许所有域名访问
 
     # 静态资源处理