From f355ecbb80aac6b4c2f0ef668061c1ac3917fd9a Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 14:46:47 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index becb1ec..f615f85 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -74,14 +74,14 @@
          	{"usr_taskcheck_query_permit","42"},	//浣滀笟鎶芥煡绠$悊
          	
          	//浣滀笟鍙樻洿绠$悊鏉冮檺
-         	{"taskchange_query_permit","37"},	//浣滀笟鍙樻洿鏌ヨ
+         	{"taskchange_query_permit","37"},		//浣滀笟鍙樻洿鏌ヨ
          	
-         	{"batt_test_op_permit","58"},	//鐢垫睜鏀剧數娴嬭瘯
-         	{"batt_test_op_permit","81"},	//鎵归噺鐢垫睜鏀剧數娴嬭瘯
+         	{"batt_test_op_permit","58"},			//鐢垫睜鏀剧數娴嬭瘯
+         	{"batt_discharge_model_permit","81"},	//鎵归噺鐢垫睜鏀剧數娴嬭瘯
          	
          	//瓒呯骇绠$悊鍛樼晫闈�
          	{"batt_discharge_model_permit","59"},	//璁惧鍏呮斁鐢垫ā鍧楀弬鏁�
-         	{"battcfg_query_permit","63"},	//鐢垫睜缁勪俊鎭厤缃�
+         	{"battcfg_query_permit","63"},			//鐢垫睜缁勪俊鎭厤缃�
          	{"batt_discharge_model_permit","68"},	//绾跨▼鐩戞帶绠$悊
          	{"batt_discharge_model_permit","64"},	//鐢ㄦ埛瀵嗙爜閲嶇疆
          	{"batt_discharge_model_permit","65"},	//鐝粍绠$悊

--
Gitblit v1.9.1