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

rk

5 天以前 794186d529b9f185032e6c3eb97d78f0c75555a6

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

@@ -412,7 +412,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text=""
            android:textSize="30sp"
            android:textSize="24sp"
            android:textColor="@color/black"
            android:gravity="center"
            app:layout_constraintTop_toTopOf="parent"