Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java

@@ -108,7 +108,7 @@
         flag=true;

         if("login.jsp".equalsIgnoreCase(source)){

            //进入登录页面的时候查询导航数组并且将其存入session

            new CustompageAction().searchAll();

            //new CustompageAction().searchAll();

         }

      }else{      

         List<Custompage> custompages = (List<Custompage>) ActionUtil.getSession().getAttribute("custompages");