From 559e188de93bb05d6c37ec1a0d392ec69ed02567 Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@S0ZHK00LKCA6OYY> Date: 星期二, 20 十一月 2018 10:41:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 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..2461e1e 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; @@ -26,7 +29,7 @@ "璧勯噾"), accountDetail("璐︽埛鏄庣粏"), extract("鎻愮幇"), orderFanli("杩斿埄璁㈠崟"),orderTiCheng("鎻愭垚璁㈠崟"),orderTaoBao("娣樺疂璁㈠崟"), coollect("鏀惰棌"), scanHistory("瓒宠抗"), team( "闃熷憳"), kefu("鑱旂郴瀹㈡湇"), taoBaoShoppingCart("娣樺疂璐墿杞�"), orderFind("璁㈠崟鐢宠瘔"), msgCenter("娑堟伅涓績"); private final String desc; - + private AppPageNotificationTypeEnum(String desc) { this.desc = desc; } @@ -63,6 +66,9 @@ @Column(name = "an_updatetime") private Date updateTime;// 鏇存柊鏃堕棿 + @Transient // 椤甸潰鍚嶇О + private String pageName; + public Long getId() { return id; } @@ -135,4 +141,12 @@ this.updateTime = updateTime; } + public String getPageName() { + return pageName; + } + + public void setPageName(String pageName) { + this.pageName = pageName; + } + } -- Gitblit v1.8.0