From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 2 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..4be6eec 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
@@ -7,6 +7,7 @@
 
 import com.google.gson.annotations.Expose;
 
+import com.yeshi.fanli.entity.SystemEnum;
 import org.yeshi.utils.mybatis.Column;
 import org.yeshi.utils.mybatis.Table;
 
@@ -39,7 +40,7 @@
 		orderTaoBao("娣樺疂璁㈠崟"),
 		coollect("鏀惰棌"),
 		scanHistory("瓒宠抗"),
-		team("闃熷憳"),
+		team("绮変笣"),
 		kefu("鑱旂郴瀹㈡湇"),
 		taoBaoShoppingCart("娣樺疂璐墿杞�"),
 		orderFind("璁㈠崟鐢宠瘔"),
@@ -56,7 +57,17 @@
 		orderFindPDD("浜笢璁㈠崟鎵惧洖"),
 		shareSingle("鍟嗗搧璇︽儏鍗曞浘鍒嗕韩"),
 		dynamicShareSingle("鍔ㄦ�佸崟鍥惧垎浜�"),
-		dynamicShareMulti("鍔ㄦ�佸鍥惧垎浜�");
+		dynamicShareMulti("鍔ㄦ�佸鍥惧垎浜�"),
+		fastShare1("蹇嵎鍒嗕韩-娣樺疂"),
+		fastShare2("蹇嵎鍒嗕韩-浜笢"),
+		fastShare3("蹇嵎鍒嗕韩-鎷煎澶�"),
+		goodsDetailVIP("鍞搧浼氳鎯�"),
+		goodsDetailSuning("鑻忓畞璇︽儏"),
+		searchGoodsResult1("鎼滅储缁撴灉-娣樺疂"),
+		searchGoodsResult2("鎼滅储缁撴灉-浜笢"),
+		searchGoodsResult3("鎼滅储缁撴灉-鎷煎澶�"),
+		searchGoodsResult4("鎼滅储缁撴灉-鍞搧浼�"),
+		searchGoodsResult5("鎼滅储缁撴灉-鑻忓畞");
 
 		private final String desc;
 
@@ -91,13 +102,37 @@
 	@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;// 鏇存柊鏃堕棿
+	//绯荤粺
+	@Column(name = "an_system")
+	private SystemEnum system;
+
+	public SystemEnum getSystem() {
+		return system;
+	}
+
+	public void setSystem(SystemEnum system) {
+		this.system = system;
+	}
 
 	@Transient // 椤甸潰鍚嶇О
 	private String pageName;
+	
+	
+	private String beginTimeVO;
+	private String endTimeVO;
+	
 
 	public Long getId() {
 		return id;
@@ -179,4 +214,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