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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java

@@ -75,9 +75,9 @@
                  + "/client/threeShareNew?uid=" + uid + "&_=" + java.lang.System.currentTimeMillis());

   }



   public static String getInviteCode(Long uid) {

   public static String getInviteCode(int base, Long uid) {



      long num = 1000000000L + uid;

      long num = base * 100000000L + uid ;



      return convert10To36(num);

   }

@@ -187,7 +187,5 @@
      } else {// 隐藏6位

         return orderId.substring(0, orderId.length() - 6) + "******";

      }



   }



}