Merge remote-tracking branch 'origin/div' into div

admin

2019-12-12 7664dae2f53abe3076a95c986ba64b2a8d949827

 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