'解决冲突'

2021-06-15 18:52:03 +08:00
parent 84b4eaca1e 128e55a4f7
commit 24ed256033
11 changed files with 38 additions and 9 deletions
--- a/app/src/main/res/layout/fragment_road.xml
+++ b/app/src/main/res/layout/fragment_road.xml
@@ -155,7 +155,6 @@
        <!--        android:text="02.拍照方式"-->
        <!--        -->
        <!--</LinearLayout>-->
-
        <LinearLayout
            android:id="@+id/ll_pictures"
            android:layout_width="wrap_content"