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/dao/mybatis/help/AppPageNotificationMapper.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java
index f784d2c..efc3132 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java
@@ -24,23 +24,31 @@
 	 */
 	AppPageNotification selectByType(String type);
 
+	/**
+	 * 閫氳繃绫诲瀷鑾峰彇鏈夋晥閫氱煡
+	 * 
+	 * @param type
+	 * @return
+	 */
+	List<AppPageNotification> listValidByType(String type);
+
 	int updateByPrimaryKeySelective(AppPageNotification record);
 
 	int updateByPrimaryKey(AppPageNotification record);
-	
+
 	/**
 	 * 鏍规嵁涓婚敭鎵归噺鍒犻櫎
 	 * @param list
 	 * @return
 	 */
 	int deleteBatchByPrimaryKey(List<Long> list);
-	
+
 	/**
 	 * 鍚庣鍒楄〃鏌ヨ
 	 * @return
 	 */
-	List<AppPageNotification> listQuery(@Param("start") long start, @Param("count") int count,
-			@Param("key") String key, @Param("show") Integer show, @Param("canClose") Integer canClose);
-	
-	long countQuery(@Param("key") String key,@Param("show") Integer show, @Param("canClose") Integer canClose);
+	List<AppPageNotification> listQuery(@Param("start") long start, @Param("count") int count, @Param("key") String key,
+			@Param("show") Integer show, @Param("canClose") Integer canClose);
+
+	long countQuery(@Param("key") String key, @Param("show") Integer show, @Param("canClose") Integer canClose);
 }
\ No newline at end of file

--
Gitblit v1.8.0