conflict server

parlemonde · Dec 12, 2024 · 1ad6f62 · 1ad6f62
1 parent a316f50
commit 1ad6f62
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/entities/user.ts b/server/entities/user.ts
@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn, ManyToOne, JoinColumn, OneToMany, ManyToMany, JoinTable, OneToOne } from 'typeorm';
+import { Column, Entity, PrimaryGeneratedColumn, ManyToOne, JoinColumn, OneToMany, ManyToMany, JoinTable, OneToOne, CreateDateColumn } from 'typeorm';
 
 import type { Country } from '../../types/country.type';
 import { UserType } from '../../types/user.type';
@@ -20,6 +20,9 @@ export class User implements UserInterface {
   @PrimaryGeneratedColumn()
   public id: number;
 
+  @CreateDateColumn()
+  createdAt: Date;
+
   @Column({ type: 'varchar', length: 255, unique: true })
   public email: string;