fix: 解决冲突

2023-08-01 16:30:08 +08:00
parent 09b3dd2f43 c54cbae676
commit a500d3ffea
25 changed files with 458 additions and 63 deletions
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -38,7 +38,7 @@
        <item
            android:id="@+id/personal_center_menu_version"
            android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：ONE_QE_V1.4.0_20230721_A" />
+            android:title="版本：ONE_QE_V1.5.0_20230728_A" />
    </group>
    <group android:checkableBehavior="single">
        <item android:title="小标题">