From b47abee8e59cfb2a5af241d34b397e41eed0155a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 12:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
index b7a04cb..979b538 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserSystemCouponGiveRecord.java
@@ -36,6 +36,9 @@
 	// 棰嗗彇uid
 	@Column(name = "cgr_receive_uid")
 	private Long receiveUid;
+	// 棰嗗彇鎴愬姛鐨勫埜id
+	@Column(name = "cgr_receive_id")
+	private Long receiveId;
 	// 棰嗗彇鏃堕棿
 	@Column(name = "cgr_receive_time")
 	private Date receiveTime;
@@ -107,4 +110,12 @@
 	public void setState(Integer state) {
 		this.state = state;
 	}
+
+	public Long getReceiveId() {
+		return receiveId;
+	}
+
+	public void setReceiveId(Long receiveId) {
+		this.receiveId = receiveId;
+	}
 }

--
Gitblit v1.8.0