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

doum

2025-11-20 cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5

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

@@ -443,7 +443,8 @@
                    app:commandType="@{6}"
                    app:onClickCommand="@{model.myTypeCommand}"
                    android:layout_marginLeft="30dp"
                    android:layout_marginRight="30dp"/>
                    android:layout_marginRight="30dp"
                    />

                <TextView
                    android:id="@+id/tv_bjgz"