From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemConfigService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemConfigService.java
index f0c4e8f..ab4adc6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemConfigService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemConfigService.java
@@ -4,21 +4,21 @@
 
 import org.springframework.cache.annotation.CacheEvict;
 
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.system.SystemConfig;
 import com.yeshi.fanli.exception.NotExistObjectException;
 
 public interface SystemConfigService {
 	
-	public int getCount(System system,String key);
+	public int getCount(BusinessSystem system,String key);
 
-	public List<SystemConfig> getSystemConfigList(int index,System system, String key);
+	public List<SystemConfig> getSystemConfigList(int index,BusinessSystem system, String key);
 	
 	public void addSystemConfig(SystemConfig sc);
 	@CacheEvict(value="childSystemCache",allEntries=true)
-	public void deleteSystem(long id, System system) throws NotExistObjectException;
+	public void deleteSystem(long id, BusinessSystem system) throws NotExistObjectException;
 	@CacheEvict(value="childSystemCache",allEntries=true)
-	public void addSystem(long id, System system)  throws NotExistObjectException;
+	public void addSystem(long id, BusinessSystem system)  throws NotExistObjectException;
 
 	public SystemConfig getSystemConfig(long id);
 
@@ -29,6 +29,6 @@
 	
 	public String get(String key) throws NotExistObjectException;
 	
-	public String get(String key, com.yeshi.fanli.entity.system.System system);
+	public String get(String key, BusinessSystem system);
 
 }

--
Gitblit v1.8.0