From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java |    4 +---
 1 files changed, 1 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..5a4eb46 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;
 	}

--
Gitblit v1.8.0