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

yujian

2020-06-29 c2e3dea0d75b7239b1ed66c9d9e1bbb177050858

 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;

   }