From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +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/help/AppPageNotification.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java
index 117c6e1..dc8cf71 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java
@@ -91,13 +91,26 @@
 	@Expose
 	@Column(name = "an_md5")
 	private String md5;// type+鍐呭+閾炬帴鐨刴d5
+	
 	@Column(name = "an_createtime")
 	private Date createTime;// 鍒涘缓鏃堕棿
+	
+	@Column(name = "an_begin_time")
+	private Date beginTime;// 寮�濮嬫椂闂�
+	
+	@Column(name = "an_end_time")
+	private Date endTime;// 缁撴潫鏃堕棿
+	
 	@Column(name = "an_updatetime")
 	private Date updateTime;// 鏇存柊鏃堕棿
 
 	@Transient // 椤甸潰鍚嶇О
 	private String pageName;
+	
+	
+	private String beginTimeVO;
+	private String endTimeVO;
+	
 
 	public Long getId() {
 		return id;
@@ -179,4 +192,36 @@
 		this.pageName = pageName;
 	}
 
+	public Date getBeginTime() {
+		return beginTime;
+	}
+
+	public void setBeginTime(Date beginTime) {
+		this.beginTime = beginTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public String getBeginTimeVO() {
+		return beginTimeVO;
+	}
+
+	public void setBeginTimeVO(String beginTimeVO) {
+		this.beginTimeVO = beginTimeVO;
+	}
+
+	public String getEndTimeVO() {
+		return endTimeVO;
+	}
+
+	public void setEndTimeVO(String endTimeVO) {
+		this.endTimeVO = endTimeVO;
+	}
+	
 }

--
Gitblit v1.8.0