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/CommentInfo.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/CommentInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/CommentInfo.java
index b395e21..9d0f311 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/CommentInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/CommentInfo.java
@@ -2,10 +2,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-
-import org.springframework.format.annotation.DateTimeFormat;
 
 import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -61,6 +58,9 @@
 	// 鍒告潵婧�
 	private String couponSource;
 	
+	// 閫氱敤鍒告槸鍚﹁浆閾�
+	private Boolean needSpin;
+			
 	private String tags;
 	private String tagsColour;
 	private String endTime;
@@ -168,4 +168,13 @@
 	public void setEndTime(String endTime) {
 		this.endTime = endTime;
 	}
+
+	public Boolean getNeedSpin() {
+		return needSpin;
+	}
+
+	public void setNeedSpin(Boolean needSpin) {
+		this.needSpin = needSpin;
+	}
+	
 }

--
Gitblit v1.8.0