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/CommentInfo.java | 26 ++++++++++++++++----------
1 files changed, 16 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..58f4277 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,24 @@
private String coupon;
// 鍒告潵婧�
private String couponSource;
- // 缁撴潫鏃堕棿
-// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// private Date endTime;
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;
}
--
Gitblit v1.8.0