Skip to content

Commit

Permalink
Conflict Resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
HyoBN committed Sep 14, 2023
2 parents 01cbf06 + b09fd10 commit 8aaf428
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public ResponseDto<MemberResponseDto.MemberProfileDto> showMyProfile(@AuthMember
}



// 내 선호 음료 조회
@Operation(summary = "[figma 더보기 - 즐겨마시는 음료 종류 1] 유저 선호 카테고리 조회 API ✔️", description = "유저 선호 카테고리 조회 API입니다.")
@Parameters({
Expand All @@ -191,6 +192,7 @@ public ResponseDto<MemberResponseDto.MemberPreferCategoryDto> memberPreferCatego
}



// 회원정보 조회 및 수정 APIs


Expand Down

0 comments on commit 8aaf428

Please sign in to comment.