From ba2555b05fcfaacd8c10bbe2cdf3d7e323566871 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 15:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
index e19a01c..f28bbeb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -13,6 +13,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
 
 /**
@@ -36,6 +37,7 @@
 	private Long id;
 
 	// 鍚嶇О
+	@Expose
 	@JoinColumn(name = "b_name")
 	@org.yeshi.utils.mybatis.Column(name = "b_name")
 	private String name;
@@ -46,28 +48,33 @@
 	private String card;
 
 	// 鏍囪瘑绠$悊id
+	@Expose
 	@JoinColumn(name = "b_card_id")
 	@org.yeshi.utils.mybatis.Column(name = "b_card_id")
 	private Long cardId;
 	
 		
 	// 涓诲浘
+	@Expose
 	@JoinColumn(name = "b_main_picture")
 	@org.yeshi.utils.mybatis.Column(name = "b_main_picture")
 	private String picture;
 	
 	// 闄勫浘
+	@Expose
 	@JoinColumn(name = "b_sub_picture")
 	@org.yeshi.utils.mybatis.Column(name = "b_sub_picture")
 	private String subPicture;
 
 	// 璺宠浆璇︽儏
+	@Expose
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "b_jumpid")
 	@org.yeshi.utils.mybatis.Column(name = "b_jumpid")
 	private JumpDetailV2 jumpDetail;
 
 	// 璺宠浆鍙傛暟
+	@Expose
 	@JoinColumn(name = "b_params")
 	@org.yeshi.utils.mybatis.Column(name = "b_params")
 	private String params;
@@ -83,6 +90,7 @@
 	private Long state;
 	
 	// 鏄剧ず绫诲瀷
+	@Expose
 	@JoinColumn(name = "b_show_type")
 	@org.yeshi.utils.mybatis.Column(name = "b_show_type")
 	private String showType;

--
Gitblit v1.8.0