Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

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

}