From b4828d7800516141d6bdb419111a5f4e0e7ac554 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期三, 09 一月 2019 11:56:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/bat-set-test.jsp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index 6d414fa..4f0944c 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -15,7 +15,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>鐢垫睜鍙傛暟璁剧疆</title>
+	    <title><s:text name="Batch_batt_param_set"/></title>						<!-- 鎵归噺鐢垫睜鍙傛暟璁剧疆 -->
 		<link rel="stylesheet" type="text/css" href="pages/css/base.css">
 		<link rel="stylesheet" type="text/css" href="jqueryui/jquery-ui.css">
 	    <link rel="stylesheet" type="text/css" href="src/css/layui.css">
@@ -59,7 +59,7 @@
         <div class="layui-page-container" data-genuitec-lp-enabled="false" data-genuitec-file-id="wc1-14" data-genuitec-path="/gx_tieta/WebRoot/batch-set-curr.jsp">
         	<!-- 鏉′欢绛涢�� -->
             <div class="layui-page-filter">
-                <div class="page-filter-header layui-page-filter-fweight">鐢垫睜鍙傛暟璁剧疆</div>
+                <div class="page-filter-header layui-page-filter-fweight"><s:text name="Batch_batt_param_set"/></div>
                 <div class="page-filter-content">
                     <table>
                         <tr class="layui-page-filter-tbl-header layui-page-filter-fweight">

--
Gitblit v1.9.1