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

admin

2020-05-14 0e030420f3edf7baf47cdb6b8edde43b76b52f4e

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java

@@ -1227,7 +1227,7 @@


      int type = 1;

      ThreeSale threeSale = threeSaleSerivce.getByWorkerId(workerId);

      if (threeSale == null) {

      if (threeSale != null && threeSale.getBoss().getId() != uid) {

         type = 2;

      }