From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 4c2e552..6474a11 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -10,7 +10,7 @@
   	<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
     <base href="<%=basePath%>">
-    <title><s:text name="Station_statestatistical"/></title>			<!-- 鏈烘埧鐘舵�佺粺璁℃煡璇�  -->
+    <title><s:text name="Station_histor_events_query"/></title>			<!-- 鏈烘埧鍘嗗彶浜嬩欢鏌ヨ  -->
 	<link rel="stylesheet" href="css/basic.css">
 	<link rel="stylesheet" type="text/css" href="css/nocontent.css">
 	<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -36,7 +36,7 @@
 	<!--瀵艰埅寮�濮�-->
 	<jsp:include page="nav.jsp" flush="true"/>
 	<div class="filter-container">
-		<div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
+		<div class="filter-title"><a href="javascript:;"><s:text name="Station_histor_events_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
 		<div class="filter-content">
 			<table>
 				<tbody>

--
Gitblit v1.9.1