Merged
Conversation
… numOfDayOff 값 세팅하는 메서드 삭제
dali186
reviewed
Aug 4, 2023
Collaborator
dali186
left a comment
There was a problem hiding this comment.
이 시간까지... 열심히 하시는군요...
혜지님이 수정하시고 PR 올려두신 줄 모르고
제가 수정해서 바로 머지 해버렸습니다 ㅠ
딱 알맞은 부분만 주석처리 해주셔서 미리 확인해볼걸 그랬네요 ㅋㅋㅋㅋ
develop에 머지하실 때 충돌나는 부분은 제가 수정하겠습니다.
관리자 코드도 검토해주셔서 감사합니당
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
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.
to 성욱님
연차신청, 내연차 계산 시 필요없어보이는 로직 일단 주석처리해놓았습니다
to 주원님
어드민에서 유저정보 (전체유저, 개인유저) 조회할때 numOfDayOff 계산 필요해보이는 부분 주석으로 했고,
연차 승인시 연차 계산하는 로직도 찾아보다가 너무 어려워서 그부분까지는 못했습니다.. 하하 주원님 코드 넘 어렵네요.....
일단 포스트맨에서 정상적으로 돌아가는거 확인하긴 했는데 다시 확인 부탁드려요!