diff --git a/.gitignore b/.gitignore index 87e228b8..1c50ffc5 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,7 @@ out/ .vscode/ *.yml -env.properties +*.properties .env smeem_fcm.json .DS_Store \ No newline at end of file diff --git a/src/main/java/com/smeme/server/model/Member.java b/src/main/java/com/smeme/server/model/Member.java index 09478d02..99b4d27d 100644 --- a/src/main/java/com/smeme/server/model/Member.java +++ b/src/main/java/com/smeme/server/model/Member.java @@ -2,7 +2,6 @@ import static jakarta.persistence.GenerationType.*; -import com.smeme.server.model.badge.Badge; import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; @@ -18,7 +17,7 @@ @Entity @NoArgsConstructor @Getter -public class Member { +public class Member extends BaseTimeEntity { @Id @GeneratedValue(strategy = IDENTITY) @Column(name = "member_id")