From 01329695ebf6eea6576d76825181b2f3833297e8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:12:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

---
 src/main/java/com/moral/service/AccountService.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/service/AccountService.java b/src/main/java/com/moral/service/AccountService.java
index a93a979..f6a8171 100644
--- a/src/main/java/com/moral/service/AccountService.java
+++ b/src/main/java/com/moral/service/AccountService.java
@@ -1,21 +1,20 @@
 package com.moral.service;
 
-import java.util.List;
 import java.util.Map;
 
-import com.moral.common.bean.ResultBean;
+import com.moral.common.bean.PageBean;
 import com.moral.entity.Account;
 
 public interface AccountService {
 
 	Map<String, Object> screenLogin(Map<String, Object> parameters);
 
-	List<Account> getAccountLists(String account, String password);
-	List<Account> getAccountList(String account);
+	Account getAccountByAccountName(String account);
 
 	void setOrgIdsByAccount(Map<String, Object> parameters);
 
-	ResultBean<Account> screenLogin1(Map<String, Object> parameters);
+	PageBean<Account> getAccountListByPage(Map<String, Object> parameters);
 
+	Integer saveOrUpdateAccount(Account account);
 
 }

--
Gitblit v1.8.0