Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

 src/main/java/com/moral/mapper/AccountMapper.java

@@ -8,4 +8,5 @@


public interface AccountMapper extends BaseMapper<Account> {

   List<Map<String, Object>> getRoleNameByAccountId(Integer accountId);

   Account getByAccountName(String name);

}