Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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

@@ -3,14 +3,10 @@
import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Mapper;



import com.moral.common.mapper.BaseMapper;

import com.moral.entity.Account;

import com.moral.entity.AccountExample;



@Mapper

public interface AccountMapper extends BaseMapper<Account, AccountExample, Integer> {



public interface AccountMapper extends BaseMapper<Account> {

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

   Account getByAccountName(String name);

}