From f196bbea81977c5e0cf5906cba2609a547fd6a3b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期六, 29 十二月 2018 15:30:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/global_zh_CN.properties |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 83cf6db..f0e0451 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1109,3 +1109,10 @@
 
 ###################  ex-battinfo.jsp   ##################################
 Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
+
+
+##################  batch-set-curr.jsp  ##############################
+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

--
Gitblit v1.9.1