From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/config/ConfigService.java |    4 +++-
 1 files changed, 3 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..9093561 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
@@ -15,6 +15,8 @@
 	void update(List<Config> list);
 
 	void update(Config config);
+	
+	void save(Config config);
 
 	String get(String string);
 
@@ -92,7 +94,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