From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/RecommendActivity.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 c3d30ae..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
@@ -65,6 +65,11 @@
 	@Column(name = "ar_top")
 	private Boolean top;// 鏄惁缃《
 
+	@Column(name = "ar_state")
+	private Integer state;// 鍙戝竷鐘舵�侊細1宸插彂甯� 0鏈彂甯�
+	
+	
+	
 	@Expose
 	@SerializedName("shareCount")
 	private String shareCountShow;
@@ -262,5 +267,13 @@
 	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