Merge branch 'master' of http://10.20.2.7:8080/r/~enchantedwyf/vbvs_app

# Conflicts: # assets/file.json # pubspec.lock
2025-07-07 14:10:55 +08:00
parent b59fd0a2f6 850d7eba5a
commit 62879acb05
17 changed files with 208 additions and 122 deletions
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -58,7 +58,6 @@ dependencies:
  weather: ^3.1.1
  lpinyin: ^2.0.3
  geocoding: ^4.0.0
-  # fl_chart: ^1.0.0
  video_player: ^2.9.5
  chewie: ^1.10.0
  map_launcher: ^3.5.0