From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index a246567..f69f7dc 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,7 +16,7 @@
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
- <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
+ <title><s:text name="Station_real_status_query"/></title> <!-- 鏈烘埧瀹炴椂鐘舵�佹煡璇� -->
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -82,7 +82,7 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary"><s:text name="Station_statequery"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_real_status_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon filter-container">
<form action="" id="search_form">
<!-- 缁存姢鍖轰俊鎭� -->
--
Gitblit v1.9.1