Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

   }