解决冲突

2023-06-02 14:18:49 +08:00
parent ebc4ddf5a9
commit e4f28405dc
2 changed files with 26 additions and 25 deletions
--- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
@@ -297,6 +297,7 @@ class MainViewModel @Inject constructor(
                }
            }
        }
+    }

    /**
     * 点击我的位置，回到我的位置
--- a/2
+++ b/2