From 071afbfec128dfd6738a9aa6c2e49200aeffed66 Mon Sep 17 00:00:00 2001
From: sudoooooo <zjbbabybaby@gmail.com>
Date: Mon, 1 Apr 2024 22:49:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=B2=E7=AA=81=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE                                                | 2 +-
 server/src/modules/auth/controllers/auth.controller.ts | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 261eeb9e..dbf0227b 100644
--- a/LICENSE
+++ b/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.
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';