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

doum

2025-10-29 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

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

@@ -17,7 +17,7 @@
            android:id="@+id/tv1"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@{data.cabinetName}"
            android:text="@{data.code}"
            android:textColor="@{data.text1Color}"
            android:textSize="24sp"
            app:layout_constraintTop_toTopOf="parent"