Skip to content

[MOD/#24] 제휴 API 수정 #118

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.

Sign up for GitHub

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

Jump to bottom
Merged
sjhwang0 merged 12 commits into from
Sep 17, 2025
Merged

[MOD/#24] 제휴 API 수정 #118

sjhwang0 merged 12 commits into from
Sep 17, 2025

Conversation

@sjhwang0
Copy link
Contributor

@sjhwang0 sjhwang0 commented Sep 16, 2025

#️⃣연관된 이슈

📝작업 내용

제휴 초안 작성 api 추가, 제휴 작성 api -> 제휴 업데이트 api 변경, ActivationStatus에 BLANK (초안일 떄) 상태 추가, 채팅방 내 제휴업체/관리자 간에 제휴 상태 확인 api 추가

🔎코드 설명(스크린샷(선택))

코드에 대한 설명을 작성해주세요.

💬고민사항 및 리뷰 요구사항 (Optional)

고민사항 및 의견 받고 싶은 부분 있으면 적어두기

비고 (Optional)

참고했던 링크 등 참고 사항을 적어주세요. 코드 리뷰하는 사람이 참고해야 하는 내용을 자유로운 형식으로 적을 수 있습니다.

@sjhwang0
[MOD/#14]
ade4bf9 
 - 컨트롤러 버저닝
@sjhwang0
[MOD/#24]
68ce83a 
 - 풀 받고 충돌 해결
@sjhwang0
Merge branch 'develop' of https://github.com/S0ftwareC0ntest/ASSU_BE …
4a505ae 
…into feat/#24-map-api
@sjhwang0
Merge branch 'develop' of https://github.com/S0ftwareC0ntest/ASSU_BE …
06fab3f 
…into feat/#24-map-api
@sjhwang0
Merge branch 'develop' of https://github.com/S0ftwareC0ntest/ASSU_BE …
323705f 
…into feat/#24-map-api
@sjhwang0
[MOD/#24]
18f8ac9 
 - 제휴 API 추가 구현 및 수정
@sjhwang0
[MOD/#24]
762114d 
 - 제휴 API 추가 구현 및 수정
@sjhwang0
Merge branch 'develop' of https://github.com/S0ftwareC0ntest/ASSU_BE …
b677a82 
…into feat/#24-map-api
@sjhwang0
[MOD/#24]
8ceb131 
 - 채팅방 내 제휴 확인 (제휴업체) 수정
@sjhwang0
Merge branch 'develop' of https://github.com/S0ftwareC0ntest/ASSU_BE …
7423ce3 
…into feat/#24-map-api
@sjhwang0 sjhwang0 requested review from 2ghrms, BAEK0111, eeeeeaaan, kimyw1018 and leesumin0526 and removed request for eeeeeaaan September 16, 2025 17:19
leesumin0526
leesumin0526 reviewed Sep 16, 2025
View reviewed changes
Copy link
Contributor

@leesumin0526 leesumin0526 left a comment

Choose a reason for hiding this comment

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

충돌 해결해 주세용

eeeeeaaan
eeeeeaaan approved these changes Sep 17, 2025
View reviewed changes
Copy link
Contributor

@eeeeeaaan eeeeeaaan left a comment

Choose a reason for hiding this comment

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

스고했어요..

@sjhwang0
[MOD/#24]
d03c087 
 - 충돌 해결
@sjhwang0
[MOD/#24]
191d437 
 - 충돌 해결
@sjhwang0 sjhwang0 merged commit afafa4c into develop Sep 17, 2025
1 check passed
@2ghrms 2ghrms deleted the feat/#24-map-api branch September 17, 2025 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leesumin0526 leesumin0526 leesumin0526 left review comments

@2ghrms 2ghrms 2ghrms approved these changes

@eeeeeaaan eeeeeaaan eeeeeaaan approved these changes

@BAEK0111 BAEK0111 Awaiting requested review from BAEK0111

@kimyw1018 kimyw1018 Awaiting requested review from kimyw1018

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sjhwang0 @leesumin0526 @2ghrms @eeeeeaaan