Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch
# Conflicts:
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.flutter-plugins
# src/.flutter-plugins-dependencies
# src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
# src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out
# src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/flutter/debug/flutter_build.d
# src/build/app/intermediates/flutter/debug/libs.jar
# src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
# src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4=
# src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
# src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/build/app/intermediates/source_set_path_map/debug/file-map.txt
# src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
# src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
# src/build/app/outputs/apk/debug/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk
# src/build/app/outputs/flutter-apk/app-debug.apk.sha1
# src/build/app/outputs/logs/manifest-merger-debug-report.txt
# src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
# src/build/sqflite/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# src/build/sqflite/intermediates/incremental/debug/packageDebugResources/merger.xml
# src/build/sqflite/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
# src/build/sqflite/intermediates/incremental/mergeDebugShaders/merger.xml
# src/build/sqflite/intermediates/incremental/packageDebugAssets/merger.xml
# src/build/sqflite/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/build/sqflite/outputs/logs/manifest-merger-debug-report.txt
# src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
|
嘉辉 JIA HUI
黎超凡
朱卿睿