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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

 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

@@ -671,4 +671,9 @@
      return userInfoMapper.getAutoExtractUserTo1212(start, count);

   }



   @Override

   public UserInfo selectAvailableByPrimaryKey(Long uid) {

      return userInfoMapper.selectAvailableByPrimaryKey(uid);

   }



}