From a6ebcc175e9b6a50456779092d2d6222b467ae64 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 三月 2019 14:14:52 +0800
Subject: [PATCH] 动态加入时间控制显示
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java
index e343d6c..c3d30ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java
@@ -40,15 +40,7 @@
@Column(name = "ar_activity_uid")
private ActivityUser activityUser;// 鍙戝竷鍔ㄦ�佺殑鐢ㄦ埛
- @Expose
- private List<RecommendActivityTaoBaoGoods> goodsList;// 鍟嗗搧鍒楄〃-鍟嗗搧鍒嗕韩鏈夋灞炴��
-
- @Expose
- private List<String> imageList;// 鍥剧墖鍒楄〃
-
- @Expose
- private List<String> widthAndHeight;
-
+
@Column(name = "ar_share_count")
private Integer shareCount;// 鍒嗕韩鏁�
@@ -78,6 +70,29 @@
private String shareCountShow;
+ @Column(name = "ar_start_time")
+ private Date startTime;//璧峰鏃堕棿
+
+ @Column(name = "ar_end_time")
+ private Date endTime;//缁撴潫鏃堕棿
+
+ // 鏄惁瀹氭椂
+ private boolean timeTask;
+ // 璧峰鏃堕棿
+ private String startTime_str;
+ // 缁撴潫鏃堕棿
+ private String endTime_str;
+
+
+ @Expose
+ private List<RecommendActivityTaoBaoGoods> goodsList;// 鍟嗗搧鍒楄〃-鍟嗗搧鍒嗕韩鏈夋灞炴��
+
+ @Expose
+ private List<String> imageList;// 鍥剧墖鍒楄〃
+
+ @Expose
+ private List<String> widthAndHeight;
+
private RecommendActivityInviteInfo inviteInfo;
public RecommendActivityInviteInfo getInviteInfo() {
@@ -207,4 +222,45 @@
public void setWidthAndHeight(List<String> widthAndHeight) {
this.widthAndHeight = widthAndHeight;
}
+
+ 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 boolean isTimeTask() {
+ return timeTask;
+ }
+
+ public void setTimeTask(boolean timeTask) {
+ this.timeTask = timeTask;
+ }
+
+ 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;
+ }
+
}
--
Gitblit v1.8.0