Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-29 9668ce3911266c1c3810c047408cc58e03086139

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

@@ -129,9 +129,6 @@
   @Transactional

   public Integer deleteAccountByLogic(Account account) {

      account.setIsDelete(Constants.IS_DELETE_TRUE);

      if (account.getId() > 0) {

         throw new BusinessException("hahahahahah..................");

      }

      return accountMapper.updateByPrimaryKeySelective(account);

   }