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

Feature/mz 137 received envelope filter api #129

Merged
merged 11 commits into from
Feb 6, 2024

Conversation

jinukeu
Copy link
Member

@jinukeu jinukeu commented Feb 6, 2024

๐Ÿ’ก Issue

  • Resolved: #์ด์Šˆ๋ฒˆํ˜ธ

๐ŸŒฑ Key changes

๋ฐ›์€ ๋ด‰ํˆฌ ํ•„ํ„ฐ & ์ •๋ ฌ ๊ธฐ๋Šฅ ๊ตฌํ˜„ํ–ˆ์Šต๋‹ˆ๋‹ค.

โœ… To Reviewers

๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท

์Šคํฌ๋ฆฐ์ƒท
ํŒŒ์ผ์ฒจ๋ถ€๋ฐ”๋žŒ
KakaoTalk_Video_2024-02-06-14-28-19.mp4

@jinukeu jinukeu added the feature label Feb 6, 2024
@jinukeu jinukeu requested a review from yangsooplus February 6, 2024 05:28
@jinukeu jinukeu self-assigned this Feb 6, 2024
@yangsooplus
Copy link
Member

conflict ํ•ด๊ฒฐํ•ด์ฃผ์„ธ์š”!

Copy link
Member

@yangsooplus yangsooplus left a comment

Choose a reason for hiding this comment

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

์ปจํ”Œ๋ฆญํŠธ ํ•ด๊ฒฐํ•˜์‹œ๊ณ , ์‹คํ–‰ ์ž˜๋˜๋Š”์ง€ ํ™•์ธํ•˜๊ณ  ๋จธ์ง€ํ•ด์ฃผ์„ธ์š”!

# Conflicts:
#	data/src/main/java/com/susu/data/data/repository/EnvelopesRepositoryImpl.kt
#	data/src/main/java/com/susu/data/remote/api/EnvelopesService.kt
#	domain/src/main/java/com/susu/domain/repository/EnvelopesRepository.kt
#	feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt
#	feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt
#	feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailScreen.kt
#	feature/received/src/main/java/com/susu/feature/received/ledgerdetail/LedgerDetailViewModel.kt
#	feature/received/src/main/java/com/susu/feature/received/navigation/ReceivedNavigation.kt
#	feature/sent/build.gradle.kts
#	feature/sent/src/main/java/com/susu/feature/sent/navigation/SentNavigation.kt
#	feature/sent/src/main/res/values/strings.xml
@jinukeu jinukeu merged commit d946bfd into develop Feb 6, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants