You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
朱卿睿
42090a29c0
Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into ZhuQingRui_Branch
# Conflicts:
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/.filecache
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/debug_android_application.stamp
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/flutter_assets.d
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/gen_dart_plugin_registrant.stamp
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/kernel_snapshot.d
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/kernel_snapshot.stamp
# src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/outputs.json
# src/.dart_tool/package_config.json
# src/.dart_tool/package_config_subset
# src/.flutter-plugins
# src/.flutter-plugins-dependencies
# src/.idea/dataSources.xml
# src/.idea/src.iml
# src/android/travelguide_android.iml
# src/build/09d72d81a00a9f27f7b0e94f584b98a3/gen_dart_plugin_registrant.stamp
# src/build/app/intermediates/assets/debug/flutter_assets/AssetManifest.bin
# src/build/app/intermediates/assets/debug/flutter_assets/AssetManifest.json
# src/build/app/intermediates/assets/debug/flutter_assets/NOTICES.Z
# src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.bin.jar
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.json.jar
# src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/NOTICES.Z.jar
# 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/AssetManifest.bin
# src/build/app/intermediates/flutter/debug/flutter_assets/AssetManifest.json
# src/build/app/intermediates/flutter/debug/flutter_assets/NOTICES.Z
# 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/pvcrzMbuPSgdf6FSX_TUqAoV86k=
# 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/mergeDebugJniLibFolders/merger.xml
# src/build/app/intermediates/incremental/mergeDebugShaders/merger.xml
# src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_0.jar
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_1.jar
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_2.jar
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_3.jar
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_4.jar
# src/build/app/intermediates/project_dex_archive/debug/out/7260739ca96ba7c6a53a579dca6f77ed64055b9b934ac0bed58718a4346e5318_5.jar
# 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/e5af93aeb062c1faf752195ab72478e5.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/collection0.dart
# src/lib/travelguideapp/ui/pages/collection1.dart
# src/lib/travelguideapp/ui/pages/collection2.dart
# src/lib/travelguideapp/ui/pages/collection3.dart
# src/lib/travelguideapp/ui/pages/collection4.dart
# src/macos/Flutter/GeneratedPluginRegistrant.swift
# src/pubspec.yaml
|
2 years ago |
doc
|
文档修改
|
2 years ago |
model
|
test
|
2 years ago |
other
|
test
|
2 years ago |
src
|
Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into ZhuQingRui_Branch
|
2 years ago |
README.md
|
md
|
2 years ago |