From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +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 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
index d26e059..edf71b6 100644
--- a/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
+++ b/gx_tieta/src/com/fgkj/Filters/HotlinkFilter.java
@@ -77,6 +77,7 @@
          	{"taskchange_query_permit","37"},	//浣滀笟鍙樻洿鏌ヨ
          	
          	{"batt_test_op_permit","58"},	//鐢垫睜鏀剧數娴嬭瘯
+         	{"batt_test_op_permit","81"},	//鎵归噺鐢垫睜鏀剧數娴嬭瘯
          	
          	//瓒呯骇绠$悊鍛樼晫闈�
          	{"batt_discharge_model_permit","59"},	//璁惧鍏呮斁鐢垫ā鍧楀弬鏁�
@@ -85,6 +86,8 @@
          	{"batt_discharge_model_permit","64"},	//鐢ㄦ埛瀵嗙爜閲嶇疆
          	{"batt_discharge_model_permit","65"},	//鐝粍绠$悊
          	{"batt_discharge_model_permit","71"},	//鐢垫睜缁勯厤缁勭鐞�
+         	{"batt_discharge_model_permit","82"},	//鍩虹珯瀹夎瀹℃壒
+         	{"batt_discharge_model_permit","83"},	//BTS璁惧鍗囩骇
          	
          	{"batt_alm_param_query_permit","31"},		//鍛婅鍙傛暟璁剧疆
          	{"batt_alm_param_query_permit","66"},		//璁惧鍛婅鍙傛暟璁剧疆

--
Gitblit v1.9.1