From 6382c2a4220ff5774dba39848c2faabf0f7002f1 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 10 十二月 2018 10:39:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index 844eea8..d26e059 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -84,6 +84,7 @@
{"batt_discharge_model_permit","68"}, //绾跨▼鐩戞帶绠＄悊
{"batt_discharge_model_permit","64"}, //鐢ㄦ埛瀵嗙爜閲嶇疆
{"batt_discharge_model_permit","65"}, //鐝粍绠＄悊
+ {"batt_discharge_model_permit","71"}, //鐢垫睜缁勯厤缁勭鐞�
{"batt_alm_param_query_permit","31"}, //鍛婅鍙傛暟璁剧疆
{"batt_alm_param_query_permit","66"}, //璁惧鍛婅鍙傛暟璁剧疆
@@ -107,7 +108,7 @@
flag=true;
if("login.jsp".equalsIgnoreCase(source)){
//杩涘叆鐧诲綍椤甸潰鐨勬椂鍊欐煡璇㈠鑸暟缁勫苟涓斿皢鍏跺瓨鍏ession
- new CustompageAction().searchAll();
+ //new CustompageAction().searchAll();
}
}else{
List<Custompage> custompages = (List<Custompage>) ActionUtil.getSession().getAttribute("custompages");
--
Gitblit v1.9.1