Merge remote-tracking branch 'origin/master'

admin

2019-01-26 b8d98797f162f34ce0e4245b0d879ea0e6a30db0

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

@@ -87,7 +87,7 @@
   }



   private static String convert10To36(Long num) {

      String numbers = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";

      String numbers = "YE9VFA3N6KG7JZH4LD5IO2RBS0QTMPU1WC8X";

      BigDecimal numBig = new BigDecimal(num);



      int ge = numBig.divideAndRemainder(new BigDecimal(36))[1].intValue();