From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index d8bab84..f726cf6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -565,11 +565,7 @@
List<UserMsgCenter> listCenter = new ArrayList<>();
// 鍗曟潯娑堟伅
- List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
-
-
-
-
+ List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
long currentTime = System.currentTimeMillis();
@@ -907,7 +903,7 @@
msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
(acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
} else if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_ZHUSHOU)) {
- msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),
+ msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),
(acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));
}
out.print(JsonUtil.loadTrueResult(""));
--
Gitblit v1.8.0