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

admin

2020-06-22 b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4

 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;

   }