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

admin

2020-05-18 f5444c6b777ba9f1e0825066e9d12fb9ce4f9f72

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java

@@ -98,9 +98,11 @@


      UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

      if (userVIPPreInfo != null) {

         if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_1) {

            return false;

         }

         return true;

      }



      return false;

   }