From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 f5ee001..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
@@ -81,6 +81,14 @@
@Column(name = "uie_close_time_extract")
private Date closeTimeExtract;
+ // 鐢ㄦ埛鏍囪瘑
+ @Column(name = "uie_mark")
+ private String mark;
+
+ // 鐢ㄦ埛鏈�杩戞椿璺冩椂闂�
+ @Column(name = "uie_active_time")
+ private Date activeTime;
+
// 鍒涘缓鏃堕棿
@Column(name = "uie_create_time")
private Date createTime;
@@ -235,4 +243,20 @@
this.closeTimeExtract = closeTimeExtract;
}
+ public String getMark() {
+ return mark;
+ }
+
+ public void setMark(String mark) {
+ this.mark = mark;
+ }
+
+ public Date getActiveTime() {
+ return activeTime;
+ }
+
+ public void setActiveTime(Date activeTime) {
+ this.activeTime = activeTime;
+ }
+
}
--
Gitblit v1.8.0