fix: 冲突修复

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright (C) 2023 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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';