xrilang/xiaoju-survey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 冲突修复

Browse Source
This commit is contained in:
sudoooooo 2024-04-01 22:49:57 +08:00
parent 746bece538
commit 071afbfec1
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. 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"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

5
server/src/modules/auth/controllers/auth.controller.ts
View File

@ -1,12 +1,7 @@
import { Controller, Post, Body, HttpCode } from '@nestjs/common'; import { Controller, Post, Body, HttpCode } from '@nestjs/common';
import { ConfigService } from '@nestjs/config'; import { ConfigService } from '@nestjs/config';
import { UserService } from '../services/user.service'; import { UserService } from '../services/user.service';
<<<<<<< Updated upstream
import { CaptchaService } from '../services/captcha.service'; // 假设你的验证码服务在这里
=======
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 { AuthService } from '../services/auth.service';
import { HttpException } from 'src/exceptions/httpException'; import { HttpException } from 'src/exceptions/httpException';
import { EXCEPTION_CODE } from 'src/enums/exceptionCode'; import { EXCEPTION_CODE } from 'src/enums/exceptionCode';