From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
index 59e94e8..03d7471 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
@@ -28,7 +28,7 @@
 	
 	@Expose
 	@Column(name = "tsi_user_type")
-	private Integer userType;// 鐢ㄦ埛绫诲瀷 0-娣樺疂 1-澶╃尗
+	private Integer userType;// 鐢ㄦ埛绫诲瀷 0-娣樺疂 1-澶╃尗  
 	
 	@Expose
 	@Column(name = "tsi_shop_id")

--
Gitblit v1.8.0