[Fix] Git 충돌 정상화

inu-appcenter · Jan 11, 2025 · f6bc765 · f6bc765
1 parent 0021213
commit f6bc765
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/kr/inuappcenterportal/inuportal/domain/member/service/MemberService.java b/src/main/java/kr/inuappcenterportal/inuportal/domain/member/service/MemberService.java
@@ -34,9 +34,9 @@ public class MemberService {
     public Long updateMemberNicknameFireId(Long id, MemberUpdateNicknameDto memberUpdateNicknameDto){
         Member member = memberRepository.findById(id).orElseThrow(()->new MyException(MyErrorCode.USER_NOT_FOUND));
         if(memberUpdateNicknameDto.getNickname()!=null) {
-            /*if (memberUpdateNicknameDto.getNickname().equals(member.getNickname())) {
+            if (memberUpdateNicknameDto.getNickname().equals(member.getNickname())) {
                 throw new MyException(MyErrorCode.SAME_NICKNAME_UPDATE);
-            }*/
+            }
             if (memberRepository.existsByNickname(memberUpdateNicknameDto.getNickname())) {
                 throw new MyException(MyErrorCode.USER_DUPLICATE_NICKNAME);
             }