From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
index 38abaa1..562b663 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
@@ -8,6 +8,8 @@
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import com.google.gson.annotations.Expose;
+
 //鍋囩敤鎴�
 @Entity
 @Table(name = "yeshi_ec_sham_user")
@@ -18,18 +20,23 @@
 	@Column(name = "`id`")
 	private long id;
 
+	@Expose
 	@Column(name = "`name`")
 	private String name;
 
+	@Expose
 	@Column(name = "`picUrl`")
 	private String picUrl;
 
+	@Expose
 	@Transient
 	private String msg;
 
+	@Expose
 	@Transient
 	private String showId;
 
+	@Expose
 	@Transient
 	private String shareBonusPic;
 

--
Gitblit v1.8.0