#4 - 保留版本 - FruitandVegetableGuide

Conversation 0 Commits 3 Files Changed 9

pngul5zaf commented

Collaborator

There is no content yet.

pngul5zaf added 3 commits

a06e55f18c 3/3UI, 相册选取，拍照，识别

0d8bc1aa45 Merge branch 'djm_branch' of https://bdgit.educoder.net/p5gy6sexf/FruitandVegetableGuide into djm_branch

# Conflicts:
#	src/FruitandVegetableGuide/.idea/deploymentTargetDropDown.xml
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/README.md
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/PhotographScreen.kt
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/RecognizeResultScreen.kt
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/PhotoComponent.kt
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/SelectPicture.kt
#	src/FruitandVegetableGuide/app/src/main/java/com/example/fruitandvegetableguide/ui/imgrecognition/camerax/TakePhoto.kt

5fab72bde6 保留版本

p5gy6sexf merged commit 9683ce0b89 into master 2 years ago

p5gy6sexf referenced this issue from a commit

Merge pull request '保留版本' (#4) from djm_branch into master

The pull request has been merged as 9683ce0b89.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: p5gy6sexf/FruitandVegetableGuide#4

保留版本 #4