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

pubspec.lock

@@ -444,7 +444,11 @@ packages:
     description:
       path: "."
       ref: main
+<<<<<<< HEAD
       resolved-ref: "840bcea66ee9222d9698a58f12a06107f337b59f"
+=======
+      resolved-ref: f307495aac440031d119a728beaccf5d33003932
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
       url: "https://gitea.wslpc.real.he-info.cn:94/flutter/easydevice.git"
     source: git
     version: "0.0.1"
@@ -452,8 +456,13 @@ packages:
     dependency: "direct main"
     description:
       path: "."
+<<<<<<< HEAD
       ref: main
       resolved-ref: "13a86afdcf71b55017ebf7ee2c22af211e642603"
+=======
+      ref: e86d515f77
+      resolved-ref: e86d515f77a736a5e6f09036e5e022153cde425d
+>>>>>>> 13eb25e1c30dcd81c87aa85bcb5306ca0931ed21
       url: "https://gitea.wslpc.real.he-info.cn:94/flutter/easyweb.git"
     source: git
     version: "0.0.1"