Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 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);

}