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/vo/msg/UserMsgVO.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserMsgVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserMsgVO.java
index 00ab9aa..7c3f4bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserMsgVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/msg/UserMsgVO.java
@@ -3,14 +3,36 @@
import java.util.Date;
import java.util.List;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
+
public class UserMsgVO {
private String icon;
private String title;
private Date time;
private String type; // order(璁㈠崟)/money(璧勯噾)/account(璐﹀彿)/invite(閭�璇�)/other锛堝叾浠栵級
private List<CommonMsgItemVO> contentItems;
+ private JumpDetailV2 jumpDetail;// 璺宠浆璇︽儏
+ private String params;// 璺宠浆鍙傛暟
+ private Long id;
- public UserMsgVO(String icon, String title, Date time, List<CommonMsgItemVO> contentItems) {
+ public JumpDetailV2 getJumpDetail() {
+ return jumpDetail;
+ }
+
+ public void setJumpDetail(JumpDetailV2 jumpDetail) {
+ this.jumpDetail = jumpDetail;
+ }
+
+ public String getParams() {
+ return params;
+ }
+
+ public void setParams(String params) {
+ this.params = params;
+ }
+
+ public UserMsgVO(Long id, String icon, String title, Date time, List<CommonMsgItemVO> contentItems) {
+ this.id = id;
this.icon = icon;
this.title = title;
this.time = time;
@@ -59,4 +81,12 @@
public void setType(String type) {
this.type = type;
}
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
}
--
Gitblit v1.8.0