From 616608ec1005bff373bc380ecc3bf02a1063497c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinGiveRecord.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinGiveRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinGiveRecord.java
index d9cfa52..1475575 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinGiveRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/UserTaoLiJinGiveRecord.java
@@ -29,12 +29,17 @@
// 璧犻�乽id
@Column(name = "tgr_give_uid")
private Long giveUid;
- // 棰嗗彇uid
- @Column(name = "tgr_receive_uid")
- private Long receiveUid;
// 璧犻�佹椂闂�
@Column(name = "tgr_give_time")
private Date giveTime;
+
+ // 璧犻�佺粨鏉熸椂闂�
+ @Column(name = "tgr_end_time")
+ private Date endTime;
+
+ // 棰嗗彇uid
+ @Column(name = "tgr_receive_uid")
+ private Long receiveUid;
// 棰嗗彇鏃堕棿
@Column(name = "tgr_receive_time")
private Date receiveTime;
@@ -99,4 +104,13 @@
public void setAmount(BigDecimal amount) {
this.amount = amount;
}
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
}
--
Gitblit v1.8.0