Merge remote-tracking branch 'origin/master'

admin

2019-03-01 bb688ff2b4b42bc440a8e7145f53e9030073fa6a

 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());

   }