From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 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 6cfb20b..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
@@ -14,13 +14,6 @@
/**
* 涓撻绠＄悊
*
- * @author yj
- *
- * @date 2018骞�10鏈�23鏃�
- */
-/**
- * @author Administrator
- *
*/
@Table("yeshi_ec_special")
public class Special implements Serializable {
@@ -140,6 +133,9 @@
// 鏄惁寮规
@Expose
private boolean elastic;
+ @Expose // 鏄惁鍊掕鏃�
+ private boolean timeTask;
+
// 鑳屾櫙鍥剧墖
private String bottomPicture;
@@ -151,18 +147,18 @@
// 闄愬埗鏈�浣庣増鏈�
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; //鏍囩
@@ -408,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;
}
@@ -440,4 +428,20 @@
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