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

yujian

2019-11-20 0f9a0a76b170bceac867dd5cd009e518ac6646e4

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

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

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

      }



   }



}