From 0fc3ad6964436013152d08f6f67920b1f4fbcca2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 09 十一月 2018 10:45:27 +0800
Subject: [PATCH] 冲突解决
---
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