Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: 6주차 작업 master에 반영 #54

Merged
merged 26 commits into from
Oct 16, 2024
Merged

merge: 6주차 작업 master에 반영 #54

merged 26 commits into from
Oct 16, 2024

Conversation

peeerr
Copy link
Contributor

@peeerr peeerr commented Oct 16, 2024

📝 작업 내용

  • 6주차 작업 master 브랜치에 반영
    • weekly/6 -> master

🔗 관련 이슈

#41 #43 #45 #47 #48 #50

peeerr and others added 26 commits October 6, 2024 14:42
- Member, Friend 엔티티에서 memberId를 member로 수정
fix: 내 일기 및 친구 일기 조회 에러 해결
- nickname, profileimage 둘중 하나만 null인 경우에 대한 처리 추가
…-edit

fix: 회원 정보 수정 API 에러 해결
- 자기 자신, 미요청 상태, 요청 상태, 받은 상태, 친구 상태
…iendrequest-status

feat: 사용자 검색 시 친구 요청 상태 추가
…agger-description

feat: Swagger API 문서에 설명 추가 및 타임존 설정
@peeerr peeerr added the 📦 merge master 브랜치 병합 label Oct 16, 2024
@peeerr peeerr self-assigned this Oct 16, 2024
@peeerr peeerr merged commit 8dab3f2 into master Oct 16, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📦 merge master 브랜치 병합
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant