合并

public/version.json

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"version":1705052583452}
-=======
-{"version":1705052873178}
->>>>>>> startLogin
+{ "version": 1705052583452 }