From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 6690724..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
@@ -38,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;
@@ -70,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