[feat] 스크랩 상품 등록 API 연결 #34
Merged
Commits on May 23, 2024
-
-
-
Merge remote-tracking branch 'origin/develop' into feat-add-scrap
# Conflicts: # app/src/main/java/org/sopt/kream/data/datasource/ProductRemoteDataSource.kt # app/src/main/java/org/sopt/kream/data/datasourceimpl/ProductRemoteDataSourceImpl.kt # app/src/main/java/org/sopt/kream/data/repository/ProductRepositoryImpl.kt # app/src/main/java/org/sopt/kream/data/service/ProductService.kt # app/src/main/java/org/sopt/kream/domain/repository/ProductRepository.kt # app/src/main/java/org/sopt/kream/presentation/common/ViewModelFactory.kt # app/src/main/res/drawable/shape_border_radius_8.xml # app/src/main/res/values/strings.xml
-
-
Merge remote-tracking branch 'origin/develop' into feat-add-scrap
# Conflicts: # app/src/main/java/org/sopt/kream/data/datasource/ProductRemoteDataSource.kt # app/src/main/java/org/sopt/kream/data/datasourceimpl/ProductRemoteDataSourceImpl.kt # app/src/main/java/org/sopt/kream/data/repository/ProductRepositoryImpl.kt # app/src/main/java/org/sopt/kream/data/service/ProductService.kt # app/src/main/java/org/sopt/kream/domain/repository/ProductRepository.kt
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.