From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
index ca2b510..df4d4ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/HelpController.java
@@ -43,7 +43,7 @@
 			return;
 		}
 
-		AppPageNotification ap = appPageNotificationService.getAppPageNotificationByTypeCache(type);
+		AppPageNotification ap = appPageNotificationService.getValidNotificationByTypeCache(type);
 		if ("home".equalsIgnoreCase(type)
 				&& VersionUtil.smallerThan_1_5_1(acceptData.getPlatform(), acceptData.getVersion()) && ap != null) {
 			AppPageNotification no = new AppPageNotification();

--
Gitblit v1.8.0