Merge remote-tracking branch 'origin/master'

zuoxiao

10 天以前 f4fc58196bd246272bf755a767660c03f573cbc6

 app/src/main/res/layout/activity_login.xml

@@ -45,7 +45,7 @@
                android:hint="请输入账号"
                android:maxLines="1"
                android:singleLine="true"
                android:text="" />
                android:text="15802220723" />
        </LinearLayout>
        <LinearLayout
            android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                android:layout_height="wrap_content"
                android:hint="初始密码为数字1-6"
                android:inputType="textPassword"
                android:text="" />
                android:text="abc_123" />
        </LinearLayout>