diff --git a/apps/web/src/components/test/StaffCard.tsx b/apps/web/src/components/test/StaffCard.tsx
new file mode 100644
index 0000000..3c67ea6
--- /dev/null
+++ b/apps/web/src/components/test/StaffCard.tsx
@@ -0,0 +1,13 @@
+import { Staff } from "packages/common/dist";
+import { api } from "packages/client/dist";
+export const StaffCard = (staff: Staff) => {
+  const { data } = api.staff.findManyWithPagination.useQuery({
+    page
+  });
+  return(
+    <div className="staff-card">
+      <div className="staff-card__username">${username}</div>
+    </div>
+  )
+    
+}
\ No newline at end of file
diff --git a/config/nginx/conf.d/web.conf b/config/nginx/conf.d/web.conf
index 3b543fa..67302b8 100755
--- a/config/nginx/conf.d/web.conf
+++ b/config/nginx/conf.d/web.conf
@@ -100,11 +100,7 @@ server {
         # 仅供内部使用
         internal;
         # 代理到认证服务
-<<<<<<< HEAD
         proxy_pass http://host.docker.internal:3000/auth/file;
-=======
-        proxy_pass http://host.docker.internal:3001/auth/file;
->>>>>>> fdb7b2357a6f025bc5d2ec0a8803142015fb2500
         
         # 请求优化：不传递请求体
         proxy_pass_request_body off;