From a18310725c451260bd93090d47978968c5bd5f65 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十月 2019 18:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
index d5dc40c..6cb6db0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java
@@ -85,6 +85,10 @@
 	@Column(name = "uie_mark")
 	private  String mark;
 	
+	// 鐢ㄦ埛鏈�杩戞椿璺冩椂闂�
+	@Column(name = "uie_active_time")
+	private  Date activeTime;
+	
 	// 鍒涘缓鏃堕棿
 	@Column(name = "uie_create_time")
 	private Date createTime;
@@ -247,4 +251,12 @@
 		this.mark = mark;
 	}
 
+	public Date getActiveTime() {
+		return activeTime;
+	}
+
+	public void setActiveTime(Date activeTime) {
+		this.activeTime = activeTime;
+	}
+	
 }

--
Gitblit v1.8.0