Merge remote-tracking branch 'origin/master'

fengxiang

2017-12-22 3e2436955a5daf512098dc879c470ee88ce003eb

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

@@ -7,6 +7,5 @@
import com.moral.entity.Account;



public interface AccountMapper extends BaseMapper<Account> {



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

}