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/UserInfo.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
index f1c728a..52e5809 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -3,8 +3,6 @@
import java.math.BigDecimal;
import javax.persistence.Column;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
import javax.persistence.Transient;
import org.yeshi.utils.mybatis.Table;
@@ -149,7 +147,7 @@
private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
@Transient
private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
-
+
public String getTaoBaoUid() {
return taoBaoUid;
}
@@ -190,6 +188,7 @@
this.rankIcon = rankIcon;
}
+ // TODO
public UserInfo() {
openid = "";
wxOpenId = "";
--
Gitblit v1.8.0