From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java
index 6b03812..11c1134 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShopInfo.java
@@ -19,6 +19,9 @@
 	private String sellerNick;// 鍗栧鏄电О
 	private String pictureUrl;// 搴楅摵鍥炬爣
 	private String shopUrl;// 搴楅摵鍦板潃
+	
+	private String userType;// 搴楅摵绫诲瀷  1-澶╃尗  0-娣樺疂()
+	
 
 	public TaoBaoShopInfo() {
 
@@ -83,4 +86,12 @@
 		this.shopUrl = shopUrl;
 	}
 
+	public String getUserType() {
+		return userType;
+	}
+
+	public void setUserType(String userType) {
+		this.userType = userType;
+	}
+
 }

--
Gitblit v1.8.0