From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
index c2885af..19e9270 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java
@@ -70,6 +70,10 @@
@Expose
@Field("createTime")
private Date createTime;
+
+ // 鏇存柊鏃堕棿
+ @Field("updateTime")
+ private Date updateTime;
// 鎵�灞炵被鍨� 1鐑攢 2濂借揣 3濂藉簵 4閭�璇�
@Field("classId")
@@ -87,6 +91,18 @@
@Field("activityId")
private Long activityId;
+ // 閭�璇风礌鏉恑d
+ @Field("inviteMaterialId")
+ private String inviteMaterialId;
+
+
+ public String getInviteMaterialId() {
+ return inviteMaterialId;
+ }
+
+ public void setInviteMaterialId(String inviteMaterialId) {
+ this.inviteMaterialId = inviteMaterialId;
+ }
public DynamicInfo() {
}
@@ -208,4 +224,12 @@
this.activityId = activityId;
}
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
}
--
Gitblit v1.8.0