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
@@ -24,6 +24,10 @@ export interface DetailUserDto {
  fname: string;
  lname: string;
  code: string | null;
+<<<<<<< HEAD
+=======
+  type: string;
+>>>>>>> origin/main
  phone: string | null;
  state: number;
 }