Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

2020-02-10 16:07:04 +08:00
parent 2e7dcd5806 595e1d7131
commit 90d445ce80
14 changed files with 643 additions and 469 deletions
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
@@ -298,6 +298,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
        return mMarker;
    }

+    @Override
    public MogoMarkerOptions getMogoMarkerOptions() {
        return mMogoMarkerOptions;
    }