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 back merge #128

Merged
merged 239 commits into from
May 3, 2024
Merged

Develop back merge #128

merged 239 commits into from
May 3, 2024

Conversation

BlueBerrySoda
Copy link

Overview

BE Merge

Related Issue

Issue Number :

Task Details

Screenshots (Optional)

Test Scope & Checklist (Optional)

Review Requirements

BlueBerrySoda and others added 30 commits March 28, 2024 17:56
…stone-2024-30 into feature/be/#22-jwtToken

# Conflicts:
#	back/build.gradle
#	back/src/main/java/com/example/capstone/domain/jwt/JwtTokenProvider.java
#	back/src/main/java/com/example/capstone/global/config/SecurityConfig.java
feature: #9-메뉴 크롤링 및 DB 저장
BlueBerrySoda and others added 29 commits May 3, 2024 04:43
Feature/be/#119 헬퍼 매칭 기능 구현 + #118 Swagger 문서 DTO 수정 및 발음평가 NaN값 보정
@BlueBerrySoda BlueBerrySoda merged commit 95ba0d6 into main May 3, 2024
5 checks passed
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.

2 participants