From aba5dee7a341ecb60fe02f088684aa982ac037f9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 11 六月 2019 09:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
index 6daf845..141fa7b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/msg/MsgDeviceReadStateService.java
@@ -37,7 +37,7 @@
 	 * @param platform
 	 * @param msgCount
 	 */
-	public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount);
+	public void addUnreadDeviceMsg(String type, String device, int platform, int msgCount, String msg);
 
 	/**
 	 * 璁剧疆鎵�鏈夋秷鎭凡璇�
@@ -54,14 +54,23 @@
 	 * @param platform
 	 */
 	public void initReadState(String device, int platform, String type);
-	
-	
+
 	/**
 	 * 鑾峰彇璁惧鏈娑堟伅鏁伴噺
+	 * 
 	 * @param device
 	 * @param platform
 	 * @return
 	 */
-	public int getUnReadCount(String device,int platform);
+	public int getUnReadCount(String device, int platform);
+
+	/**
+	 * 鑾峰彇璁惧鏈娑堟伅鏁伴噺(鏍规嵁绫诲瀷)
+	 * @param device
+	 * @param platform
+	 * @param type
+	 * @return
+	 */
+	public int getUnReadCount(String device, int platform, String type);
 
 }

--
Gitblit v1.8.0