Merge branch 'master' of https://bdgit.educoder.net/pvqcyimsk/gitproject
# Conflicts:
# src/MyApplication/.idea/vcs.xml
# src/MyApplication/app/build.gradle
# src/MyApplication/app/src/MyApplication/app/src/main/java/com/example/myapplication/WNaviGuideActivity.java
# src/MyApplication/app/src/MyApplication/app/src/main/java/com/example/myapplication/yuyin.java
# src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_itemfound.xml
# src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_yuyin.xml
# src/MyApplication/app/src/MyApplication/app/src/main/res/layout/activity_zhaoxun.xml
|
