From f4ed03e33cd777996c697894c4075128546c3a74 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/mapper/AccountMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/mapper/AccountMapper.java b/src/main/java/com/moral/mapper/AccountMapper.java
index 22aaf08..c3a65b1 100644
--- a/src/main/java/com/moral/mapper/AccountMapper.java
+++ b/src/main/java/com/moral/mapper/AccountMapper.java
@@ -7,6 +7,6 @@
 import com.moral.entity.Account;
 
 public interface AccountMapper extends BaseMapper<Account> {
-
 	List<Map<String, Object>> getRoleNameByAccountId(Integer accountId);
+	Account getByAccountName(String name);
 }
\ No newline at end of file

--
Gitblit v1.8.0