Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 1fd8f11537bb74c1f7e611e35a766cbbd34eff05

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -670,6 +670,7 @@
      userInfoMapper.updateByPrimaryKeySelective(userInfo);

   }



   @Transactional

   @Override

   public void register(UserInfo userInfo) throws UserAccountException {

      if (!StringUtil.isNullOrEmpty(userInfo.getPhone())) {