From 2b35e920a8873ba81530f4d86002a459185725ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 九月 2019 16:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java
index a05ba15..3602b08 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java
@@ -38,6 +38,10 @@
 	@Expose
 	@Column(name = "td_remark")
 	private String remark; // 澶囨敞
+	
+	@Expose
+	@Column(name = "td_unique_key")
+	private String uniqueKey; // 鍞竴鍊�
 
 	@Expose
 	@Column(name = "td_create_time")
@@ -99,4 +103,13 @@
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+
+	public String getUniqueKey() {
+		return uniqueKey;
+	}
+
+	public void setUniqueKey(String uniqueKey) {
+		this.uniqueKey = uniqueKey;
+	}
+	
 }

--
Gitblit v1.8.0