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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

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

@@ -295,7 +295,7 @@
      }

      

      int countTeam2 = 0;

      List<ThreeSale> listSecondTeam = threeSaleSerivce.listSecondTeam(0,  Integer.MAX_VALUE, superUid);

      List<ThreeSale> listSecondTeam = threeSaleSerivce.listSecondTeam(0, Integer.MAX_VALUE, superUid);

      if (listSecondTeam != null && listSecondTeam.size() > 0) {

         for (ThreeSale team: listSecondTeam) {

            if (team.getWorker() == null || team.getWorker().getId() == null) {