Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

 src/main/java/com/moral/service/impl/AccountServiceImpl.java

@@ -170,8 +170,10 @@


   @Override

   public Optional<Account> queryAccountByName(String accountName) {

      Account account = new Account();

      account.setAccountName(accountName);

      return Optional.ofNullable(accountMapper.selectOne(account));

      Account account = accountMapper.getByAccountName(accountName);

      if(account!=null){



      }

      return Optional.ofNullable(account);

   }

}