From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/equip-charge-param.jsp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/equip-charge-param.jsp b/gx_tieta/WebRoot/equip-charge-param.jsp
index 4c2354b..7cc7238 100644
--- a/gx_tieta/WebRoot/equip-charge-param.jsp
+++ b/gx_tieta/WebRoot/equip-charge-param.jsp
@@ -36,7 +36,7 @@
 	<div id="main">
 		<!-- 鏌ヨ鏉′欢寮�濮� -->
 		<div class="query-list">
-			<div class="query-header"><a href="javascript:;"><s:text name="Equipment_discharg_model_param"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>			<!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁�  鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
+			<div class="query-header"><a href="javascript:;"><s:text name="Discharg_model_state"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>			<!-- 璁惧鍏呮斁鐢垫ā鍧楀弬鏁�  鏄剧ず鎴栭殣钘忔煡璇㈡潯浠� -->
 			<!-- 鏌ヨ鏉′欢鍐呭寮�濮� -->
 			<div class="query-body">
 				<form action="" id="search_form">

--
Gitblit v1.9.1