Merge branch 'KangJiangLong_Branch' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into develop
# Conflicts:
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.idea/libraries/Dart_Packages.xml
# 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/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/project_dex_archive/debug/out/fd5f28bbb2814597ada3448ec80ce6248fe0317ebf66c649cc19e41ac83c140c_0.jar
# src/build/app/intermediates/source_set_path_map/debug/file-map.txt
# src/build/app/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at
# 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
|
黎超凡
康江龙
朱卿睿