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/bus/activity/ActivityUser.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java
index 80c615a..55f3f3b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.bus.activity;
+import java.io.Serializable;
import java.util.Date;
import com.google.gson.annotations.Expose;
@@ -13,7 +14,12 @@
*
*/
@Table("yeshi_ec_activity_user")
-public class ActivityUser {
+public class ActivityUser implements Serializable{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
public ActivityUser() {
}
@@ -32,6 +38,12 @@
private String portrait;
@Column(name = "au_create_time")
private Date createTime;
+
+ // 鏍囩
+ @Expose
+ @Column(name = "au_tag")
+ private String tag;
+
public String getNickName() {
return nickName;
@@ -64,4 +76,12 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
+
+ public String getTag() {
+ return tag;
+ }
+
+ public void setTag(String tag) {
+ this.tag = tag;
+ }
}
--
Gitblit v1.8.0