From eb58d2d4fcc201dbfb31e96c58e680b7da0a846e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 六月 2020 11:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/GoodsEvaluate.java | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 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 951a832..468cf35 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
@@ -30,7 +30,7 @@
public final static int LINE_NUM_ONE = 1;
public final static int LINE_NUM_TWO = 2;
public final static int LINE_NUM_THREE = 3;
-
+
public enum EvaluateEnum {
single("鍗曞搧"), multiple("澶氬搧"), activity("娲诲姩");
@@ -45,8 +45,6 @@
}
}
-
-
@Id
@Expose
@Field("_id")
@@ -55,7 +53,7 @@
// 绫诲瀷
@Field("type")
private EvaluateEnum type;
-
+
@Expose
@Field("user")
private ActivityUser user; // 鍙戝竷鐢ㄦ埛
@@ -67,17 +65,16 @@
@Expose
@Field("shareNum")
private Integer shareNum; // 鍒嗕韩娆℃暟
-
- // 鍥剧墖涓�琛屾樉绀猴細 0鏃犲浘 1涓�寮� 2涓ゅ紶 3寮�
+
+ // 鍥剧墖涓�琛屾樉绀猴細 0鏃犲浘 1涓�寮� 2涓ゅ紶 3寮�
@Expose
@Field("lineNum")
private Integer lineNum;
-
+
@Expose
@Field("imgList")
- private List<ImgInfo> imgList = new ArrayList<ImgInfo>(); // 鍥剧墖淇℃伅
+ private List<ImgInfo> imgList = new ArrayList<ImgInfo>(); // 鍥剧墖淇℃伅
-
@Field("shareNumReal")
private Integer shareNumReal; // 鍒嗕韩娆℃暟鐪熷疄
@@ -88,56 +85,54 @@
@Expose
@Field("comments")
private List<CommentInfo> comments = new ArrayList<CommentInfo>(); // 璇勮淇℃伅
-
+
@Expose
@Field("publishTime")
private Date publishTime; // 鍙戝竷鏃堕棿
-
@Field("state")
private Integer state; // 鐘舵��
-
+
@Field("weight")
private Double weight; // 鏉冮噸
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Field("startTime")
private Date startTime; // 寮�濮嬫椂闂�
-
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Field("endTime")
private Date endTime; // 缁撴潫鏃堕棿
-
+
@Field("createTime")
private Date createTime; // 鍒涘缓鏃堕棿
@Field("updateTime")
private Date updateTime; // 鏇存柊鏃堕棿
-
+
@Field("mainPicNum")
private Integer mainPicNum; // 鍥剧墖涓诲浘
-
+
@Field("dynamicType")
private Integer dynamicType; // 1鍙戝湀 2绱犳潗
-
+
+ @Field("zeroPoint")
+ private Integer zeroPoint; // 鏄惁0鐐规椿鍔�-10鐐硅繘琛屽彂鍦� 1-鏄�
+
@Expose
@Field("jumpLink")
private String jumpLink;
-
-
+
// 鏄惁浜戝彂鍗�
@Expose
private boolean cloud;
-
-
-
+
private String startTimeChar;
private String endTimeChar;
-
+
// 澶囨敞
private String remarks;
-
-
+
public String getId() {
return id;
}
@@ -329,5 +324,13 @@
public void setCloud(boolean cloud) {
this.cloud = cloud;
}
-
+
+ public Integer getZeroPoint() {
+ return zeroPoint;
+ }
+
+ public void setZeroPoint(Integer zeroPoint) {
+ this.zeroPoint = zeroPoint;
+ }
+
}
--
Gitblit v1.8.0