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

weekly_5 반영 #39

Merged
merged 147 commits into from
Oct 5, 2024
Merged

weekly_5 반영 #39

merged 147 commits into from
Oct 5, 2024

Conversation

rbm0524
Copy link
Contributor

@rbm0524 rbm0524 commented Oct 4, 2024

rbm0524 and others added 30 commits September 20, 2024 19:55
feat: PaymentOrder 와 PaymentEvent 연관관계 추가
spotless 들여쓰기가 공백 2자에서 4자로 적용되도록 수정
PersistenceConfig 에서 적용되어 중복 제거
Json 필드 이름과 KakaoAccount 객체의 필드 이름이 같음
생성자 생략 가능
@rbm0524 rbm0524 self-assigned this Oct 4, 2024
rbm0524 and others added 8 commits October 5, 2024 11:12
# 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
@rbm0524 rbm0524 merged commit 50d6dce into Develop Oct 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants