Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/teami/domain/friend/repository/FriendRepository.java
#	src/main/java/com/teami/domain/reward/controller/RewardController.java
#	src/main/java/com/teami/domain/reward/repository/MemberRewardRepository.java

src/main/java/com/teami/domain/member/controller/MemberController.java

@@ -9,6 +9,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/teami/domain/reward/repository/MemberRewardRepository.java

@@ -2,6 +2,7 @@
 
 import com.teami.domain.reward.dto.RewardResponse;
 import com.teami.domain.reward.entity.MemberReward;
+import com.teami.domain.reward.entity.Reward;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/com/teami/global/apiPayload/code/status/ErrorStatus.java

@@ -35,13 +35,13 @@ public enum ErrorStatus implements BaseErrorCode {
     NICKNAME_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4003", "이미 존재하는 닉네임 입니다."),
     PASSWORD_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4004", "비밀번호가 일치하지 않습니다."),
 
+
     // 친구 관련 에러
     SELF_FRIEND_REQUEST_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "FRIEND4001", "본인과 친구 관계를 맺을 수 없습니다."),
     FRIEND_NOT_FOUND(HttpStatus.NOT_FOUND, "FRIEND4041", "친구 관계를 찾을 수 없습니다."),
     ALREADY_EXIST_FRIEND(HttpStatus.CONFLICT, "FRIEND4091", "이미 존재하는 친구 관계입니다."),
 
 
-    // 예시,,,
     ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."),
     TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"),
     FOOD_CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "FOOD4001", "음식이이 없습니다."),