Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

weimingfei

2025-10-31 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a

 keyCabinet-android/app/src/main/res/layout/key_cabinet_activity.xml

@@ -147,7 +147,7 @@
                android:id="@+id/tv_jg2"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="如有问题请联系管理员15899098765"
                android:text="如有问题请联系管理员"
                android:textColor="#ff666666"
                android:textSize="24sp"
                app:layout_constraintTop_toBottomOf="@+id/tv_jg1"
@@ -211,7 +211,7 @@
                android:id="@+id/tv_tip2_2"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:text="如有问题请联系管理员15899098765"
                android:text="如有问题请联系管理员"
                android:textColor="#ff666666"
                android:textSize="24sp"
                app:layout_constraintTop_toBottomOf="@+id/tv_tip2_1"