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

admin

2020-03-01 b730b81641e9eadac879a401aedbd333e6973e28

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

@@ -77,7 +77,7 @@


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



      long num = base * 1000000000L + uid ;

      long num = base * 100000000L + uid ;



      return convert10To36(num);

   }