From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/integral/IntegralDetail.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 3602b08..1775af3 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
@@ -47,7 +47,9 @@
@Column(name = "td_create_time")
private Date createTime;
-
+ private String nickName;// 鏄电О
+ private String portrait;// 澶村儚
+
public Long getId() {
return id;
}
@@ -111,5 +113,21 @@
public void setUniqueKey(String uniqueKey) {
this.uniqueKey = uniqueKey;
}
+
+ public String getNickName() {
+ return nickName;
+ }
+
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
+ public String getPortrait() {
+ return portrait;
+ }
+
+ public void setPortrait(String portrait) {
+ this.portrait = portrait;
+ }
}
--
Gitblit v1.8.0