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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

 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;

   }