From bf3b679f5d89c00c8685fa44975b10c4ffeed64f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 17 Jan 2020 11:42:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=96=B0=E9=B2=9C?=
 =?UTF-8?q?=E4=BA=8B=E5=84=BF=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/entity/MarkerNoveltyInfo.java      | 56 +++++++++++++++----
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
index 1b013807f9..a09010b15f 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java
@@ -7,14 +7,12 @@ package com.mogo.module.common.entity;
 public class MarkerNoveltyInfo {
     private String type;
     private MarkerLocation location;
-    private MarkerUserInfo userInfo;
     /**
      * @see MarkerPoiTypeEnum
      */
     private String poiType;
     private ContentData contentData;
 
-
     public ContentData getContentData() {
         return contentData;
     }
@@ -47,21 +45,16 @@ public class MarkerNoveltyInfo {
         this.type = type;
     }
 
-    public MarkerUserInfo getUserInfo() {
-        return userInfo;
-    }
-
-    public void setUserInfo(MarkerUserInfo userInfo) {
-        this.userInfo = userInfo;
-    }
 
     public class ContentData {
         private String content;
         private String iconUrl;
         private String imgUrl;
         private String infoId;
-        private Long likeNum;
+        private long likeNum;
         private String title;
+        private boolean displayNavigation;
+        private String styleType;
 
         public String getContent() {
             return content;
@@ -95,11 +88,11 @@ public class MarkerNoveltyInfo {
             this.infoId = infoId;
         }
 
-        public Long getLikeNum() {
+        public long getLikeNum() {
             return likeNum;
         }
 
-        public void setLikeNum(Long likeNum) {
+        public void setLikeNum(long likeNum) {
             this.likeNum = likeNum;
         }
 
@@ -111,5 +104,44 @@ public class MarkerNoveltyInfo {
             this.title = title;
         }
 
+        public boolean isDisplayNavigation() {
+            return displayNavigation;
+        }
+
+        public void setDisplayNavigation(boolean displayNavigation) {
+            this.displayNavigation = displayNavigation;
+        }
+
+        public String getStyleType() {
+            return styleType;
+        }
+
+        public void setStyleType(String styleType) {
+            this.styleType = styleType;
+        }
+
+        @Override
+        public String toString() {
+            return "ContentData{" +
+                    "content='" + content + '\'' +
+                    ", iconUrl='" + iconUrl + '\'' +
+                    ", imgUrl='" + imgUrl + '\'' +
+                    ", infoId='" + infoId + '\'' +
+                    ", likeNum=" + likeNum +
+                    ", title='" + title + '\'' +
+                    ", displayNavigation=" + displayNavigation +
+                    ", styleType='" + styleType + '\'' +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "MarkerNoveltyInfo{" +
+                "type='" + type + '\'' +
+                ", location=" + location +
+                ", poiType='" + poiType + '\'' +
+                ", contentData=" + contentData +
+                '}';
     }
 }