squallzhjch
b5afd6fd2b
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts:
app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
vtm
2023-11-21 17:40:52 +08:00
..
2023-04-26 10:46:12 +08:00
2023-11-09 17:25:25 +08:00
2023-11-21 17:40:52 +08:00
2023-03-21 16:57:28 +08:00
2023-10-30 16:40:27 +08:00
2023-03-21 16:57:28 +08:00
2023-03-21 16:57:28 +08:00