Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -72,9 +72,8 @@
   

   public static String getInviteShortLink (Long uid) {

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

            + Constant.systemCommonConfig.getProjectName() + "/"

            + java.lang.System.currentTimeMillis()+

            "/client/threeShareNew?uid=" + uid);

            + Constant.systemCommonConfig.getProjectName() +

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

   }