feat#415——合并

2025-02-15 23:29:56 +08:00
parent daa7b860b2 e8b5fc8dd3
commit 4b47f7d16f
10 changed files with 118 additions and 338 deletions
@@ -26,5 +26,10 @@ android.enableJetifier=true
 android.useAndroidX=true
 android.useDeprecatedNdk=true

+<<<<<<< HEAD
 versionCode=57
-versionName=4.11.11
+versionName=4.11.11
+=======
+versionCode=101
+versionName=4.12.01
+>>>>>>> release-20250211