From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserExtraTaoBaoInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserExtraTaoBaoInfo.java
index 0346dfa..a5f623b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserExtraTaoBaoInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserExtraTaoBaoInfo.java
@@ -27,6 +27,8 @@
 	private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
 	@Column(name = "uiet_taobao_order_end_6_num")
 	private String taoBaoOrderEnd6Num;// 璁㈠崟缁撳熬鐨�6涓暟瀛�
+	@Column(name = "uiet_taobao_nick_name")
+	private String taoBaoNickName;// 娣樺疂鏄电О
 	@Column(name = "uiet_create_time")
 	private Date createTime;
 	@Column(name = "uiet_update_time")
@@ -128,4 +130,11 @@
 		this.updateTime = updateTime;
 	}
 
+	public String getTaoBaoNickName() {
+		return taoBaoNickName;
+	}
+
+	public void setTaoBaoNickName(String taoBaoNickName) {
+		this.taoBaoNickName = taoBaoNickName;
+	}
 }

--
Gitblit v1.8.0