From 616b119c283147deef21fbc519291221ba4897b1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@MS-20170306HGUF>
Date: 星期二, 18 二月 2020 11:30:03 +0800
Subject: [PATCH] Merge branch 'div' of ssh://yujian@193.112.35.168:29418/fanli-server.git into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
index 214a3b2..d484cee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
@@ -150,7 +150,7 @@
 				
 				commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),
 						zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
-						wxmpJumDetail, null, 0));
+						wxmpJumDetail, zhuShouMsg.getParams(), 0));
 				
 				
 			}

--
Gitblit v1.8.0