Merge branch 'master' of http://git.it.real.he-info.cn:90/r/~enchantedwyf/vbvs_app

2025-07-01 11:52:25 +08:00
parent 413aacae22 13eb25e1c3
commit 3bb2fba582
83 changed files with 5526 additions and 3411 deletions
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 sdk.dir=C:\\Users\\Administrator\\AppData\\Local\\Android\\sdk
 flutter.sdk=C:\\dev\\flutter
+=======
+sdk.dir=C:\\Users\\wyf\\AppData\\Local\\Android\\sdk
+flutter.sdk=D:\\flutter_res\\flutter
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
 flutter.buildMode=debug
 flutter.versionName=1.0.0
 flutter.versionCode=1