Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 third-zxing/src/main/res/layout/activity_capture.xml

@@ -16,7 +16,7 @@


        <!--1.返回按钮 增大点击区域-->

        <LinearLayout

            android:id="@+id/top_back_btn"

            android:id="@+id/top_back_ll"

            android:layout_width="56dp"

            android:layout_height="match_parent"

            android:gravity="center_vertical"