GUIDE-131 01 main 백엔드 작업#73
Merged
2ralumin merged 22 commits intoguiderun-project:developfrom May 31, 2024
Hidden character warning
The head ref may contain hidden characters: "GUIDE-131_01_MAIN_\ubc31\uc5d4\ub4dc_\uc791\uc5c5"
Merged
Conversation
(search dto 전용 패키지를 만들기 위함)
…/backend into GUIDE-131_01_MAIN_백엔드_작업 � Conflicts: � run/src/test/java/com/guide/run/user/service/UserServiceTest.java
# Conflicts: # run/src/main/java/com/guide/run/event/entity/dto/response/get/MyPageEvent.java # run/src/main/java/com/guide/run/event/entity/dto/response/get/MyPageEventResponse.java # run/src/main/java/com/guide/run/event/entity/dto/response/search/SearchAllEventsCount.java
…/backend into GUIDE-131_01_MAIN_백엔드_작업 # Conflicts: # run/src/main/java/com/guide/run/admin/controller/AdminUserController.java # run/src/main/java/com/guide/run/event/controller/EventController.java # run/src/main/java/com/guide/run/event/controller/EventGetController.java # run/src/main/java/com/guide/run/user/controller/MypageController.java # run/src/main/java/com/guide/run/user/service/MypageService.java
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
타입
작업 사항
메인페이지
변경 내용
EventType에 Total 추가
관련 이슈
Resolves: #123 ...(해결한 이슈 번호)
See also: #45 #6 ...(참고 이슈 번호)