Merge pull request #42 from kakao-tech-campus-2nd-step3/develop

develop - 정기 병합
kakao-tech-campus-2nd-step3 · Oct 14, 2024 · 56c3be3 · 56c3be3
2 parents 605d1ae + e834c8f
commit 56c3be3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/helpmeCookies/user/entity/ArtistInfo.java b/src/main/java/com/helpmeCookies/user/entity/ArtistInfo.java
@@ -22,6 +22,10 @@ public class ArtistInfo {
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
 
+	private Long userId;
+
+	private String artistType;
+
 	@Column(nullable = false)
 	private Long totalFollowers;
 

diff --git a/src/main/java/com/helpmeCookies/user/entity/BusinessArtist.java b/src/main/java/com/helpmeCookies/user/entity/BusinessArtist.java
@@ -23,9 +23,6 @@ public class BusinessArtist {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	@Column(nullable = false)
-	private Long userId;
-
 	@Column(nullable = false)
 	private String businessNumber;
 

diff --git a/src/main/java/com/helpmeCookies/user/entity/StudentArtist.java b/src/main/java/com/helpmeCookies/user/entity/StudentArtist.java
@@ -26,9 +26,6 @@ public class StudentArtist {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	@Column(nullable = false)
-	private Long userId;
-
 	@Column(nullable = false)
 	private String schoolEmail;
 	@Column(nullable = false)

diff --git a/src/main/java/com/helpmeCookies/user/entity/User.java b/src/main/java/com/helpmeCookies/user/entity/User.java
@@ -39,6 +39,9 @@ public class User {
 	@Column(nullable = false)
 	private Long id;
 
+	@Column(nullable = false)
+	private String name;
+
 	@Column(nullable = false)
 	private String nickname;