Merge remote-tracking branch 'origin/main' into backend_complete

2025-09-21 03:49:22 +02:00
parent c9813a7ff4 f216435dd0
commit cf157643d7
1039 changed files with 80635 additions and 19 deletions
@@ -21,6 +21,10 @@ export class UserMapper {
      fname: user.fname,
      lname: user.lname,
      code: user.token,
+<<<<<<< HEAD
+=======
+      type: user.type,
+>>>>>>> origin/main
      phone: user.phone,
      state: user.state,
    };