From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java
index 357a657..027a708 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java
@@ -75,7 +75,7 @@
@Expose
@Field("imgList")
- private List<ImgInfo> imgList = new ArrayList<>(); // 鍥剧墖淇℃伅
+ private List<ImgInfo> imgList = new ArrayList<ImgInfo>(); // 鍥剧墖淇℃伅
@Field("shareNumReal")
@@ -87,7 +87,7 @@
@Expose
@Field("comments")
- private List<CommentInfo> comments = new ArrayList<>(); // 璇勮淇℃伅
+ private List<CommentInfo> comments = new ArrayList<CommentInfo>(); // 璇勮淇℃伅
@Expose
@Field("publishTime")
@@ -108,7 +108,6 @@
@Field("endTime")
private Date endTime; // 缁撴潫鏃堕棿
-
@Field("createTime")
private Date createTime; // 鍒涘缓鏃堕棿
@@ -121,9 +120,17 @@
@Field("dynamicType")
private Integer dynamicType; // 1鍙戝湀 2绱犳潗
+ @Expose
+ @Field("jumpLink")
+ private String jumpLink;
+
private String startTimeChar;
private String endTimeChar;
+
+ // 澶囨敞
+ private String remarks;
+
public String getId() {
return id;
@@ -292,5 +299,21 @@
public void setDynamicType(Integer dynamicType) {
this.dynamicType = dynamicType;
}
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
+
+ public String getJumpLink() {
+ return jumpLink;
+ }
+
+ public void setJumpLink(String jumpLink) {
+ this.jumpLink = jumpLink;
+ }
}
--
Gitblit v1.8.0