Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

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

}