From 8d84ca36593e33de7e0b604824c471db3587fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:53:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/help/AppPageNotificationMapper.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 5116cfb..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
@@ -23,32 +23,32 @@
 	 * @return
 	 */
 	AppPageNotification selectByType(String type);
-	
+
 	/**
 	 * 閫氳繃绫诲瀷鑾峰彇鏈夋晥閫氱煡
 	 * 
 	 * @param type
 	 * @return
 	 */
-	AppPageNotification selectValidByType(String type);
+	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