From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 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 8d756f3..ffe4064 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
@@ -2,23 +2,18 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 import org.yeshi.utils.mybatis.Column;
 import org.yeshi.utils.mybatis.Table;
 
 import com.google.gson.annotations.Expose;
 import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
 
 /**
  * 涓撻绠$悊
  * 
- * @author yj
- *
- * @date 2018骞�10鏈�23鏃�
- */
-/**
- * @author Administrator
- *
  */
 @Table("yeshi_ec_special")
 public class Special implements Serializable {
@@ -106,6 +101,7 @@
 	@Column(name = "b_show_type")
 	private String showType;
 
+	@Expose
 	// 澶囨敞
 	@Column(name = "b_remark")
 	private String remark;
@@ -148,13 +144,27 @@
 	// 闄愬埗鏈�浣庣増鏈�
 	private String version;
 	
-	
-	// 鏄惁瀹氭椂
-	private boolean timeTask;
 	// 璧峰鏃堕棿
 	private String startTime_str;
 	// 缁撴潫鏃堕棿
 	private String endTime_str;
+	
+	@Expose
+	private long countDownTime;//鍊掕鏃�
+
+	private List<SpecialLabel> listLabels; //鏍囩
+	
+	@Expose
+	private List<ClientTextStyleVO> labels; //鏍囩
+
+	
+	public long getCountDownTime() {
+		return countDownTime;
+	}
+
+	public void setCountDownTime(long countDownTime) {
+		this.countDownTime = countDownTime;
+	}
 
 	public Long getId() {
 		return id;
@@ -389,14 +399,6 @@
 		this.endTime = endTime;
 	}
 
-	public boolean isTimeTask() {
-		return timeTask;
-	}
-
-	public void setTimeTask(boolean timeTask) {
-		this.timeTask = timeTask;
-	}
-
 	public String getStartTime_str() {
 		return startTime_str;
 	}
@@ -412,5 +414,21 @@
 	public void setEndTime_str(String endTime_str) {
 		this.endTime_str = endTime_str;
 	}
-	
+
+	public List<ClientTextStyleVO> getLabels() {
+		return labels;
+	}
+
+	public void setLabels(List<ClientTextStyleVO> labels) {
+		this.labels = labels;
+	}
+
+	public List<SpecialLabel> getListLabels() {
+		return listLabels;
+	}
+
+	public void setListLabels(List<SpecialLabel> listLabels) {
+		this.listLabels = listLabels;
+	}
+
 }

--
Gitblit v1.8.0