Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

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

@@ -20,7 +20,6 @@
        android:layout_height="22.5dp"
        android:layout_marginTop="11.5dp"
        android:gravity="center"
        android:text="数据为空,赶快创建一个吧"
        android:textColor="@color/text_7C8590"
        android:textSize="@dimen/text_16"
        app:layout_constraintEnd_toEndOf="parent"