From d1fe0aeb6aa1f205c6cfae319ebc91f33c1db3f6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 05 五月 2019 12:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
index bafa6b4..19b77f8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java
@@ -92,7 +92,7 @@
 	 * @param page
 	 * @return
 	 */
-	public int getCount(String key, int page);
+	public int getCount(String key);
 
 	public Config getConfig(long id);
 

--
Gitblit v1.8.0