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

doum

2 天以前 22881a4d6409c7d17867e1d40bf81a13578208df

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

@@ -88,7 +88,7 @@
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:background="@null"
                android:text="18656077929"
                android:text=""
                android:textColor="#111111"
                android:hint="请输入登录账号"
                android:textColorHint="#999999"
@@ -138,7 +138,7 @@
                android:layout_width="0dp"
                android:layout_height="75dp"
                android:background="@null"
                android:text="Whyc2025"
                android:text=""
                android:hint="请输入账号密码"
                android:textColorHint="#999999"
                android:textSize="24sp"