Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-25 3c1f04d76fdd1f60bd78696f8a1aac6dafbbb543

 fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java

@@ -313,8 +313,6 @@
   @RequestMapping("threeShareNew")

   public String threeShareNew(HttpServletRequest request, HttpSession session, HttpServletResponse response,

         long uid) {

      String serverName = request.getServerName();

      String contextPath = request.getContextPath();

      UserInfo userInfo = userInfoService.getUserById(uid);

      if (userInfo == null) {

         return "share/error";