Merge pull request #156 from MEME-UMC/revert-155-feat/#152

[Revert] main 브랜치에 잘못 merge된 커밋 되돌리기
MEME-UMC · Apr 16, 2024 · dff26e7 · dff26e7
2 parents c2e4889 + c124c70
commit dff26e7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/main/java/umc/meme/shop/domain/artist/entity/Artist.java b/src/main/java/umc/meme/shop/domain/artist/entity/Artist.java
@@ -82,7 +82,6 @@ public void tempMethod(){
         this.username = "name";
         this.email="";
         this.password="";
-        this.workExperience=WorkExperience.FIVE;
         this.role="ARTIST";
         this.userStatus = UserStatus.ACTIVE;
         this.provider = Provider.KAKAO;

diff --git a/src/main/java/umc/meme/shop/global/enums/Status.java b/src/main/java/umc/meme/shop/global/enums/Status.java
@@ -1,5 +1,5 @@
 package umc.meme.shop.global.enums;
 
 public enum Status {
-    EXPECTED, COMPLETE, CANCEL, PENDING
+    EXPECTED, COMPLETE, CANCEL
 }