Merge remote-tracking branch 'origin/master'

admin

2019-01-28 e52789b7e099f6e8f10543afbc4f9010b5e94e1a

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

@@ -812,4 +812,15 @@
      return userInfoMapper.longTimeNoLogin(daysNum, list);

   }



   /**

    * 根据电话号码、邀请码获取邀请用户

    * @param phone

    * @param inviteCode

    * @return

    */

   @Override

   public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {

      return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);

   }

	
}