Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Conflicts: vtm
2023-08-10 11:18:40 +08:00
parent 4baa137ad6 d11dd5e806
commit 6bed16f470
32 changed files with 996 additions and 270 deletions
--- a/app/src/main/res/layout/dialog_view_edittext.xml
+++ b/app/src/main/res/layout/dialog_view_edittext.xml
@@ -11,7 +11,7 @@
        android:layout_margin="8dp"
        android:background="@drawable/shape_rect_white_2dp_bg"
        android:hint="请备注无需作业原因"
-        android:lines="5"
+        android:lines="4"
        android:textSize="13dp" />

 </androidx.constraintlayout.widget.ConstraintLayout>