From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 94 insertions(+), 7 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 6dab052..77c1ee6 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;
@@ -117,6 +113,14 @@
 	// ios鏈�灏忕増鏈�
 	@Column(name = "b_min_ios_version_code")
 	private Integer minIOSVersionCode;
+
+	//璧峰鏃堕棿
+	@Column(name = "b_start_time")
+	private Date startTime;
+	
+	//缁撴潫鏃堕棿
+	@Column(name = "b_end_time")
+	private Date endTime;
 	
 	// 鍒涘缓鏃堕棿
 	@Column(name = "b_createtime")
@@ -129,6 +133,9 @@
 	// 鏄惁寮规
 	@Expose
 	private boolean elastic;
+	@Expose // 鏄惁鍊掕鏃�
+	private boolean timeTask;
+	
 
 	// 鑳屾櫙鍥剧墖
 	private String bottomPicture;
@@ -139,6 +146,30 @@
 
 	// 闄愬埗鏈�浣庣増鏈�
 	private String version;
+	
+	// 璧峰鏃堕棿
+	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;
@@ -357,4 +388,60 @@
 		this.minIOSVersionCode = minIOSVersionCode;
 	}
 
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getStartTime_str() {
+		return startTime_str;
+	}
+
+	public void setStartTime_str(String startTime_str) {
+		this.startTime_str = startTime_str;
+	}
+
+	public String getEndTime_str() {
+		return endTime_str;
+	}
+
+	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;
+	}
+
+	public boolean isTimeTask() {
+		return timeTask;
+	}
+
+	public void setTimeTask(boolean timeTask) {
+		this.timeTask = timeTask;
+	}
+
 }

--
Gitblit v1.8.0