From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 0e09f70..8cfed4e 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.entity.dynamic;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -74,7 +75,7 @@
@Expose
@Field("imgList")
- private List<ImgInfo> imgList; // 鍥剧墖淇℃伅
+ private List<ImgInfo> imgList = new ArrayList<ImgInfo>(); // 鍥剧墖淇℃伅
@Field("shareNumReal")
@@ -86,7 +87,7 @@
@Expose
@Field("comments")
- private List<CommentInfo> comments; // 璇勮淇℃伅
+ private List<CommentInfo> comments = new ArrayList<CommentInfo>(); // 璇勮淇℃伅
@Expose
@Field("publishTime")
@@ -117,10 +118,16 @@
@Field("mainPicNum")
private Integer mainPicNum; // 鍥剧墖涓诲浘
+ @Field("dynamicType")
+ private Integer dynamicType; // 1鍙戝湀 2绱犳潗
private String startTimeChar;
private String endTimeChar;
+
+ // 澶囨敞
+ private String remarks;
+
public String getId() {
return id;
@@ -281,5 +288,20 @@
public void setType(EvaluateEnum type) {
this.type = type;
}
-
+
+ public Integer getDynamicType() {
+ return dynamicType;
+ }
+
+ public void setDynamicType(Integer dynamicType) {
+ this.dynamicType = dynamicType;
+ }
+
+ public String getRemarks() {
+ return remarks;
+ }
+
+ public void setRemarks(String remarks) {
+ this.remarks = remarks;
+ }
}
--
Gitblit v1.8.0