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

yujian

2019-12-17 7e51ff02bba60c1577e321d6a0d0f31474e0a2fa

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

@@ -515,8 +515,8 @@
    * @return

    */

   @Override

   public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {

      return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);

   public UserInfo getUserInfoByInviteCode(String inviteCode) {

      return userInfoMapper.getUserInfoByInviteCode(inviteCode);

   }



   @Override