final changes

2025-09-22 11:14:32 +02:00
parent cf157643d7
commit bf9ae5f01f
509 changed files with 920 additions and 64152 deletions
@@ -21,10 +21,6 @@ export class UserMapper {
      fname: user.fname,
      lname: user.lname,
      code: user.token,
-<<<<<<< HEAD
-=======
-      type: user.type,
->>>>>>> origin/main
      phone: user.phone,
      state: user.state,
    };
@@ -24,10 +24,6 @@ export interface DetailUserDto {
  fname: string;
  lname: string;
  code: string | null;
-<<<<<<< HEAD
-=======
-  type: string;
->>>>>>> origin/main
  phone: string | null;
  state: number;
 }