From 58ee87fd64efdb75d16e396c3d952d3522c3a747 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期三, 04 三月 2020 17:54:53 +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 | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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..b395e21 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
@@ -37,13 +37,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 +60,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