From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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..9b19073 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 {
/**
*
*/
@@ -23,8 +26,11 @@
// 娑堟伅绫诲瀷鐨勬灇涓�
public enum AppPageNotificationTypeEnum {
home("棣栭〉"), coupon("浼樻儬鍒搁〉"), invite("閭�璇锋湁濂栭〉"), activity("鍔ㄦ��"), goodsDetail("璇︽儏杩囧害椤�"), mine("鎴戠殑"), money(
- "璧勯噾"), accountDetail("璐︽埛鏄庣粏"), extract("鎻愮幇"), orderFanli("杩斿埄璁㈠崟"),orderTiCheng("鎻愭垚璁㈠崟"),orderTaoBao("娣樺疂璁㈠崟"), coollect("鏀惰棌"), scanHistory("瓒宠抗"), team(
- "闃熷憳"), kefu("鑱旂郴瀹㈡湇"), taoBaoShoppingCart("娣樺疂璐墿杞�"), orderFind("璁㈠崟鐢宠瘔"), msgCenter("娑堟伅涓績");
+ "璧勯噾"), accountDetail("璐︽埛鏄庣粏"), extract("鎻愮幇"), orderFanli("杩斿埄璁㈠崟"), orderTiCheng("鎻愭垚璁㈠崟"), orderTaoBao(
+ "娣樺疂璁㈠崟"), coollect("鏀惰棌"), scanHistory("瓒宠抗"), team("闃熷憳"), kefu("鑱旂郴瀹㈡湇"), taoBaoShoppingCart(
+ "娣樺疂璐墿杞�"), orderFind("璁㈠崟鐢宠瘔"), msgCenter("娑堟伅涓績"), newOrder("璁㈠崟"), shareHistory(
+ "鍒嗕韩璁板綍"), goodsStorage(
+ "閫夊搧搴�"), tlj("鍒嗕韩鐖嗘璇︽儏"), tlj_buy("鑷喘绔嬪噺璇︽儏"), hongbao_balance("绾㈠寘浣欓");
private final String desc;
private AppPageNotificationTypeEnum(String desc) {
@@ -42,19 +48,19 @@
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
@@ -62,6 +68,9 @@
private Date createTime;// 鍒涘缓鏃堕棿
@Column(name = "an_updatetime")
private Date updateTime;// 鏇存柊鏃堕棿
+
+ @Transient // 椤甸潰鍚嶇О
+ private String pageName;
public Long getId() {
return id;
@@ -135,4 +144,12 @@
this.updateTime = updateTime;
}
+ public String getPageName() {
+ return pageName;
+ }
+
+ public void setPageName(String pageName) {
+ this.pageName = pageName;
+ }
+
}
--
Gitblit v1.8.0