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

fix: 解决冲突 (#87)

Browse Source
This commit is contained in:
luch 2024-03-28 21:46:15 +08:00 committed by GitHub
parent 11df81eb08
commit 47a831b1ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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