fork repo main에 추가 #330
Merged
fork repo main에 추가 #330
Conversation
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
…evelop MAIN PUSH
…nto concat/test
현재 상태 저장 시 프론트의 입력에 따라서 정렬
현재 상태 저장 시 프론트의 입력에 따라서 정렬
[feat] tts 예외처리 및 현재 상태 저장 시 정렬 기능 프론트에서 입력하도록 변경
[main] TTS 현재 상태 저장 시 정렬순서를 클라이언트에서 받도록 변경 / TTS 예외처리 추가
…nto concat/test
[feat] concatTab + concatRow 저장/조회 기능 수정
[fix] VC 예외처리 변경, 추가
[fix] project exception ADD
# Conflicts: # src/main/java/com/oreo/finalproject_5re5_be/global/component/MethodTime.java # src/main/java/com/oreo/finalproject_5re5_be/global/exception/ErrorCode.java # src/main/java/com/oreo/finalproject_5re5_be/global/exception/MethodTimeException.java
[chore] 필요없는 CICD 스크립트 삭제
- 테스트 환경에서는 파일이 프로젝트의 소스 디렉토리가 아닌 컴파일된 target 디렉토리 기준으로 로드될 수 있기때문에 변경하였습니다.
# Conflicts: # README.md # src/main/java/com/oreo/finalproject_5re5_be/concat/controller/ConcatController.java # src/main/java/com/oreo/finalproject_5re5_be/concat/dto/lambda/AudioFormatDto.java # src/main/java/com/oreo/finalproject_5re5_be/concat/dto/lambda/LambdaConcatRequest.java # src/main/java/com/oreo/finalproject_5re5_be/concat/dto/lambda/response/AudioInfo.java # src/main/java/com/oreo/finalproject_5re5_be/concat/dto/lambda/response/LambdaConcatResultDto.java # src/main/java/com/oreo/finalproject_5re5_be/concat/dto/request/ConcatRowRequestDto.java # src/main/java/com/oreo/finalproject_5re5_be/concat/entity/BgmFile.java # src/main/java/com/oreo/finalproject_5re5_be/concat/entity/ConcatResult.java # src/main/java/com/oreo/finalproject_5re5_be/concat/entity/ConcatTab.java # src/main/java/com/oreo/finalproject_5re5_be/concat/service/ConcatResultService.java # src/main/java/com/oreo/finalproject_5re5_be/concat/service/lambda/LambdaConcatService.java # src/main/java/com/oreo/finalproject_5re5_be/global/component/audio/AudioExtensionConverter.java
[fix] develop - main 충돌 해결
alswooy
requested review from
K-KY,
Ryu-Eun,
jongheonleee,
oowtl and
yschoi123
as code owners
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
No description provided.