From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java |   94 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 84 insertions(+), 10 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 356742a..0f87f0c 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
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.entity.bus.activity;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -15,7 +16,11 @@
  *
  */
 @Table("yeshi_ec_activity_recommend")
-public class RecommendActivity {
+public class RecommendActivity implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	public final static int TYPE_SHARE_GOODS = 1;// 鍟嗗搧鍒嗕韩
 	public final static int TYPE_INVITE = 2;// 鐢熸垚閭�璇峰浘
 	public final static int TYPE_TEXTIMG = 3;// 绠�鍗曞浘鏂�
@@ -35,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;// 鍒嗕韩鏁�
 
@@ -68,11 +65,39 @@
 	@Column(name = "ar_top")
 	private Boolean top;// 鏄惁缃《
 
+	@Column(name = "ar_state")
+	private Integer state;// 鍙戝竷鐘舵�侊細1宸插彂甯� 0鏈彂甯�
+	
+	
+	
 	@Expose
 	@SerializedName("shareCount")
 	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() {
@@ -202,4 +227,53 @@
 	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;
+	}
+
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+	
 }

--
Gitblit v1.8.0