Merge remote-tracking branch 'origin/feature/v1.0.4' into feature/v1.0.4

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerNoveltyInfo.java

@@ -54,7 +54,7 @@ public class MarkerNoveltyInfo {
         this.sn = sn;
     }
 
-    public class ContentData {
+    public static class ContentData {
         private String content;
         private String iconUrl;
         private String imgUrl;
@@ -66,6 +66,8 @@ public class MarkerNoveltyInfo {
         private boolean desplayHost;
         private boolean fabulous;
         private String styleType;
+        //上报类型：1-用户上报，2-后台上报 3-三方上报
+        private String uploadType;
 
         public String getContent() {
             return content;
@@ -155,6 +157,14 @@ public class MarkerNoveltyInfo {
             this.fabulous = fabulous;
         }
 
+        public String getUploadType() {
+            return uploadType;
+        }
+
+        public void setUploadType(String uploadType) {
+            this.uploadType = uploadType;
+        }
+
         @Override
         public String toString() {
             return "ContentData{" +
@@ -169,6 +179,7 @@ public class MarkerNoveltyInfo {
                     ", desplayHost=" + desplayHost +
                     ", fabulous=" + fabulous +
                     ", styleType='" + styleType + '\'' +
+                    ", uploadType='" + uploadType + '\'' +
                     '}';
         }
     }