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

[develop-sprint-3] 3차 개발 sprint develop 브랜치로 이전 #191

Merged
merged 45 commits into from
Mar 21, 2023

Conversation

chaerlo127
Copy link
Member

📚 이슈 번호

#159 #160 #161

💬 기타 사항

  • 진짜 수고 많았슴다유!!ㅜㅜㅜㅜㅜ 최고서버😙

JoongHyun-Kim and others added 30 commits March 9, 2023 16:08
[feature/7-desserts-getDessert] 상품 상세 조회 API에 디자인 요금 추가
[feature/161-orders-cancel] 주문 취소 API 추가
[feature/7-desserts-addDessert] [판매자] 상품 등록 API에 디자인 요금 추가
[feature/161-orders-get] 주문 상세 조회 api
[feature/161-orders-history] 주문 내역 조회 API 추가
chaerlo127 and others added 15 commits March 14, 2023 23:03
[feature/161-orders-get] 주문 화면 조회
[feature/161-orders-get] 주문 수정 화면 조회 api 생성
[feature/161-orders-get] [판매자] 주문 상세 조회
…61-orders-make

# Conflicts:
#	src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
#	src/main/java/com/codepatissier/keki/order/controller/OrderController.java
#	src/main/java/com/codepatissier/keki/order/service/OrderService.java
[feature/161-orders-make] 주문하기 API
Copy link
Member

@JoongHyun-Kim JoongHyun-Kim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

Copy link
Member

@sojungpp sojungpp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

룰루😽

Copy link
Member

@psyeon1120 psyeon1120 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😆

@chaerlo127 chaerlo127 merged commit 9e8b659 into develop Mar 21, 2023
@chaerlo127 chaerlo127 added the 🍊 sprint #3 3차 Sprint label Mar 21, 2023
@chaerlo127 chaerlo127 added this to the 3차 Sprint milestone Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍰 feature 새로운 기능 추가 🍊 sprint #3 3차 Sprint
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants