Merge branch 'wjc_new' into lwj_new

mac

2024-05-30 619d22243b0b44f81d6b2bb82c9e087b0dca6f3b

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

@@ -24,7 +24,7 @@
        android:layout_marginTop="@dimen/dp_42"
        android:text="@string/home_login_change_password"
        android:textAlignment="center"
        android:textColor="@color/text_90000000"
        android:textColor="@color/text_E6000000"
        android:textSize="@dimen/text_28"
        android:textStyle="bold"
        app:layout_constraintStart_toStartOf="parent"