-
Notifications
You must be signed in to change notification settings - Fork 4
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
weekly_5 반영 #39
Merged
weekly_5 반영 #39
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1주차 Develop 반영
feat: PaymentOrder 와 PaymentEvent 연관관계 추가
spotless 들여쓰기가 공백 2자에서 4자로 적용되도록 수정
PersistenceConfig 에서 적용되어 중복 제거
Json 필드 이름과 KakaoAccount 객체의 필드 이름이 같음
생성자 생략 가능
feat: 카카오 로그인하기 #1
IllegalArgumentException -> NoSuchElementException
…mapper feat: MapStruct 적용
feat: 주문 상세 정보 생성 구현 #26
# Conflicts: # src/main/java/com/ordertogether/team14_be/memebr/persistence/entity/Member.java # src/main/java/com/ordertogether/team14_be/payment/domain/PaymentEvent.java # src/main/java/com/ordertogether/team14_be/payment/domain/PaymentOrder.java # src/main/java/com/ordertogether/team14_be/payment/domain/PaymentOrderStatus.java # src/main/java/com/ordertogether/team14_be/payment/domain/Product.java # src/main/java/com/ordertogether/team14_be/spot/controller/SpotController.java # src/main/java/com/ordertogether/team14_be/spot/dto/SpotDto.java # src/main/java/com/ordertogether/team14_be/spot/entity/Spot.java # src/main/java/com/ordertogether/team14_be/spot/repository/SpotRepository.java # src/main/java/com/ordertogether/team14_be/spot/service/SpotService.java
생성자 생략 가능
memebr -> member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pr제목 -> 관련 이슈 #4
📌 관련 이슈
✨ PR 내용
5주차 코드 PR