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

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;
     }

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java

@@ -222,4 +222,11 @@ public interface IMogoMarker {
      * @param position window 的位置。
      */
     void setPositionByPixels( Point position );
+
+    /**
+     * Marker 配置
+     * @return
+     */
+    MogoMarkerOptions getMogoMarkerOptions();
+
 }