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/SystemClientParamsService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java
index 57cc372..14d0fdc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/config/SystemClientParamsService.java
@@ -3,9 +3,9 @@
 import java.util.List;
 
 import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 import com.yeshi.fanli.entity.system.CustomerContent;
 import com.yeshi.fanli.entity.system.CustomerName;
-import com.yeshi.fanli.entity.system.System;
 import com.yeshi.fanli.entity.system.SystemClientParams;
 
 public interface SystemClientParamsService {
@@ -14,13 +14,13 @@
 	
 	public List<SystemClientParams> getSystemClientParamsBySystemId(long id,int version);
 
-	public List<SystemClientParamsAdmin> getAdminList(System system, String key);
+	public List<SystemClientParamsAdmin> getAdminList(BusinessSystem system, String key);
 
-	public void addSystemClientParamsList(SystemClientParams scp, List<System> list) throws Exception;
+	public void addSystemClientParamsList(SystemClientParams scp, List<BusinessSystem> list) throws Exception;
 
-	public void deleteSystemClientParams(SystemClientParams scp, System system);
+	public void deleteSystemClientParams(SystemClientParams scp, BusinessSystem system);
 
-	public void addSystemClientParams(SystemClientParams scp, System system);
+	public void addSystemClientParams(SystemClientParams scp, BusinessSystem system);
 
 	public void deleteSystemClientParams(SystemClientParams scp);
 
@@ -35,7 +35,7 @@
 	 * @param key
 	 * @return
 	 */
-	public SystemClientParams getSystemClientParamsBySystemAndKey(System system, String key);
+	public SystemClientParams getSystemClientParamsBySystemAndKey(BusinessSystem system, String key);
 
 	public Integer getCount(int type);
 

--
Gitblit v1.8.0