Merge pull request #150 from Team-Smeme/sohyeon_#149

[ADD] Member 칼럼 추가
Team-Smeme · Aug 29, 2023 · 8b1cdc4 · 8b1cdc4
2 parents faffb92 + 61689eb
commit 8b1cdc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,7 +37,7 @@ out/
 .vscode/
 
 *.yml
-env.properties
+*.properties
 .env
 smeem_fcm.json
 .DS_Store
diff --git 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")