diff --git a/server/src/modules/auth/controllers/auth.controller.ts b/server/src/modules/auth/controllers/auth.controller.ts
index 8211517e..5fcdc5af 100644
--- a/server/src/modules/auth/controllers/auth.controller.ts
+++ b/server/src/modules/auth/controllers/auth.controller.ts
@@ -1,12 +1,7 @@
 import { Controller, Post, Body, HttpCode } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { UserService } from '../services/user.service';
-<<<<<<< Updated upstream
-import { CaptchaService } from '../services/captcha.service'; // 假设你的验证码服务在这里
-=======
 import { CaptchaService } from '../services/captcha.service';
-import { ConfigService } from '@nestjs/config';
->>>>>>> Stashed changes
 import { AuthService } from '../services/auth.service';
 import { HttpException } from 'src/exceptions/httpException';
 import { EXCEPTION_CODE } from 'src/enums/exceptionCode';