From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/CommentInfo.java |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 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 49d6f55..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;
@@ -37,13 +34,17 @@
 	private String id;
 	// 绫诲瀷
 	@Expose
-	private CommentInfoEnum type;
+	private CommentInfoEnum typeEnum;
+	// 绫诲瀷
+	@Expose
+	private String type;
+	
 	// 鍐呭
 	@Expose
 	private String content;
 	// 鏍囩
 	@Expose
-	private List<ClientTextStyleVO> tagList = new ArrayList<>() ;
+	private List<ClientTextStyleVO> tagList = new ArrayList<ClientTextStyleVO>() ;
 	// 鏍囩璇存槑
 	@Expose
 	private String tagDesc;
@@ -56,19 +57,27 @@
 	private String coupon;
 	// 鍒告潵婧�
 	private String couponSource;
-	// 缁撴潫鏃堕棿
-//	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") 
-//	private Date endTime;
 	
+	// 閫氱敤鍒告槸鍚﹁浆閾�
+	private Boolean needSpin;
+			
 	private String tags;
 	private String tagsColour;
 	private String endTime;
+ 
+	public CommentInfoEnum getTypeEnum() {
+		return typeEnum;
+	}
 
-	public CommentInfoEnum getType() {
+	public void setTypeEnum(CommentInfoEnum typeEnum) {
+		this.typeEnum = typeEnum;
+	}
+
+	public String getType() {
 		return type;
 	}
 
-	public void setType(CommentInfoEnum type) {
+	public void setType(String type) {
 		this.type = type;
 	}
 
@@ -159,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