From eed5715ed72cda38a07d792b3750fdb077ff0492 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 09 一月 2019 14:30:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
index 49e5d5f..8734d71 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1118,4 +1118,7 @@
 Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5
 
 ##################  batt-station-update1.jsp   #########################
-BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
\ No newline at end of file
+BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7
+
+##################  bat-set-test.jsp     ##############################
+Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e
\ No newline at end of file

--
Gitblit v1.9.1