resolve conflicts

src/auth/controllers/authentication.controller.ts

@@ -1,17 +0,0 @@
-import { Controller, Post } from '@nestjs/common';
-import { AuthenticationService } from '../services/authentication.service';
-import { ApiTags } from '@nestjs/swagger';
-import { EnableDisableStatusEnum } from '@app/common/constants/days.enum';
-
-@Controller({
-  version: EnableDisableStatusEnum.ENABLED,
-  path: 'authentication',
-})
-@ApiTags('Tuya Auth')
-export class AuthenticationController {
-  constructor(private readonly authenticationService: AuthenticationService) {}
-  @Post('auth2')
-  async Authentication() {
-    return await this.authenticationService.main();
-  }
-}

src/auth/controllers/index.ts

@@ -1,2 +1 @@
-export * from './authentication.controller';
 export * from './user-auth.controller';

src/auth/controllers/user-auth.controller.ts

@@ -84,7 +84,7 @@ export class UserAuthController {
 
   @ApiBearerAuth()
   @UseGuards(SuperAdminRoleGuard)
-  @Get('user/list')
+  @Get('user')
   async userList() {
     const userList = await this.userAuthService.userList();
     return {