From 91b1cbfa7658c5eec67ea3b40fd421fa9e43d34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 13 Apr 2020 16:29:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E9=B2=9C=E4=BA=8B=E5=84=BF=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?//=E4=B8=8A=E6=8A=A5=E7=B1=BB=E5=9E=8B=EF=BC=9A1-=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=8A=E6=8A=A5=EF=BC=8C2-=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=203-=E4=B8=89=E6=96=B9=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/common/entity/MarkerNoveltyInfo.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 0ea6d4e7e9..69a2e3d46c 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 @@ -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 + '\'' + '}'; } } From a7d1f7e4ef5ddb3a018e4dfa816a26a58a680781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 13 Apr 2020 16:53:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=80=E6=94=BE=E4=BA=86ContentData?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=9A=84=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/common/entity/MarkerNoveltyInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 69a2e3d46c..229abb1aba 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 @@ -54,7 +54,7 @@ public class MarkerNoveltyInfo { this.sn = sn; } - public class ContentData { + static public class ContentData { private String content; private String iconUrl; private String imgUrl; From 884fe07861282064863c499e92f4c47584ee5c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 13 Apr 2020 16:56:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E6=94=BE=E4=BA=86ContentData?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=9A=84=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/common/entity/MarkerNoveltyInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 229abb1aba..a0a0d527a2 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 @@ -54,7 +54,7 @@ public class MarkerNoveltyInfo { this.sn = sn; } - static public class ContentData { + public static class ContentData { private String content; private String iconUrl; private String imgUrl;