Merge remote-tracking branch 'origin/master'

admin

2019-04-22 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d

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

@@ -73,7 +73,7 @@
   public static String getInviteShortLink (Long uid) {

      return HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"

            + Constant.systemCommonConfig.getProjectName() +

            "/client/threeShareNew?uid=" + uid +"&" + java.lang.System.currentTimeMillis());

            "/client/threeShareNew?uid=" + uid +"&_=" + java.lang.System.currentTimeMillis());

   }