From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..ae01e94 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,8 +8,9 @@
import javax.persistence.Table;
import javax.persistence.Transient;
+import com.google.gson.annotations.Expose;
+
//鍋囩敤鎴�
-@Entity
@Table(name = "yeshi_ec_sham_user")
@org.yeshi.utils.mybatis.Table("yeshi_ec_sham_user")
public class ShamUser {
@@ -18,18 +19,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