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 | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 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 3078161..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 {
@@ -138,6 +133,9 @@
// 鏄惁寮规
@Expose
private boolean elastic;
+ @Expose // 鏄惁鍊掕鏃�
+ private boolean timeTask;
+
// 鑳屾櫙鍥剧墖
private String bottomPicture;
@@ -149,18 +147,22 @@
// 闄愬埗鏈�浣庣増鏈�
private String version;
-
- // 鏄惁瀹氭椂
- @Expose
- 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;
}
@@ -402,14 +404,6 @@
this.endTime = endTime;
}
- public boolean isTimeTask() {
- return timeTask;
- }
-
- public void setTimeTask(boolean timeTask) {
- this.timeTask = timeTask;
- }
-
public String getStartTime_str() {
return startTime_str;
}
@@ -425,5 +419,29 @@
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