Merge branch 'wjc_new' into lwj_new

mac

2024-05-30 619d22243b0b44f81d6b2bb82c9e087b0dca6f3b

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

@@ -9,7 +9,7 @@
        android:layout_width="@dimen/dp_141"
        android:layout_height="272dp"
        android:layout_marginStart="61dp"
        android:layout_marginTop="@dimen/dp_89"
        android:layout_marginTop="67dp"
        android:layout_marginEnd="174dp"
        android:background="@drawable/list_464d5a"
        app:layout_constraintStart_toStartOf="parent"