From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 100 insertions(+), 8 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 0f9cd2a..61eaaa6 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 @@ -3,7 +3,10 @@ import java.io.Serializable; import java.util.Date; +import javax.persistence.Transient; + import com.google.gson.annotations.Expose; + import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; @@ -14,7 +17,7 @@ * */ @Table("yeshi_ec_apppage_notification") -public class AppPageNotification implements Serializable{ +public class AppPageNotification implements Serializable { /** * */ @@ -22,9 +25,42 @@ // 娑堟伅绫诲瀷鐨勬灇涓� public enum AppPageNotificationTypeEnum { - home("棣栭〉"), coupon("浼樻儬鍒搁〉"), invite("閭�璇锋湁濂栭〉"), activity("鍔ㄦ��"), goodsDetail("璇︽儏杩囧害椤�"), mine("鎴戠殑"), money( - "璧勯噾"), accountDetail("璐︽埛鏄庣粏"), extract("鎻愮幇"), orderFanli("杩斿埄璁㈠崟"),orderTiCheng("鎻愭垚璁㈠崟"),orderTaoBao("娣樺疂璁㈠崟"), coollect("鏀惰棌"), scanHistory("瓒宠抗"), team( - "闃熷憳"), kefu("鑱旂郴瀹㈡湇"), taoBaoShoppingCart("娣樺疂璐墿杞�"), orderFind("璁㈠崟鐢宠瘔"), msgCenter("娑堟伅涓績"); + home("棣栭〉"), + coupon("浼樻儬鍒搁〉"), + invite("閭�璇锋湁濂栭〉"), + activity("鍔ㄦ��"), + goodsDetail("璇︽儏杩囧害椤�"), + mine("鎴戠殑"), + money("璧勯噾"), + accountDetail("璐︽埛鏄庣粏"), + extract("鎻愮幇"), + orderFanli("杩斿埄璁㈠崟"), + orderTiCheng("鎻愭垚璁㈠崟"), + orderTaoBao("娣樺疂璁㈠崟"), + coollect("鏀惰棌"), + scanHistory("瓒宠抗"), + team("绮変笣"), + kefu("鑱旂郴瀹㈡湇"), + taoBaoShoppingCart("娣樺疂璐墿杞�"), + orderFind("璁㈠崟鐢宠瘔"), + msgCenter("娑堟伅涓績"), + newOrder("璁㈠崟"), + shareHistory("鍒嗕韩璁板綍"), + goodsStorage("閫夊搧搴�"), + tlj("鍒嗕韩鐖嗘璇︽儏"), + tlj_buy("鑷喘绔嬪噺璇︽儏"), + hongbao_balance("绾㈠寘浣欓"), + goodsDetailJD("浜笢璇︽儏"), + goodsDetailPDD("鎷煎澶氳鎯�"), + orderFindJD("鎷煎澶氳鍗曟壘鍥�"), + orderFindPDD("浜笢璁㈠崟鎵惧洖"), + shareSingle("鍟嗗搧璇︽儏鍗曞浘鍒嗕韩"), + dynamicShareSingle("鍔ㄦ�佸崟鍥惧垎浜�"), + dynamicShareMulti("鍔ㄦ�佸鍥惧垎浜�"), + fastShare1("蹇嵎鍒嗕韩-娣樺疂"), + fastShare2("蹇嵎鍒嗕韩-浜笢"), + fastShare3("蹇嵎鍒嗕韩-鎷煎澶�"); + private final String desc; private AppPageNotificationTypeEnum(String desc) { @@ -42,26 +78,42 @@ private AppPageNotificationTypeEnum type;// 绫诲瀷 @Column(name = "an_show") private Boolean show;// 鏄惁鏄剧ず - + @Expose @Column(name = "an_can_close") private Boolean canClose;// 鏄惁鍙互鍏抽棴 - + @Expose @Column(name = "an_content") private String content;// 鍐呭 - + @Expose @Column(name = "an_content_url") private String contentUrl;// 閾炬帴 - + @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; @@ -135,4 +187,44 @@ this.updateTime = updateTime; } + public String getPageName() { + return pageName; + } + + public void setPageName(String pageName) { + 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