From e26e8d76a027ba94bb035c5f6137cf17ee42001a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 09 十月 2018 11:51:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index b4ed367..3d1d844 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1081,3 +1081,7 @@
 
 ##################  btsStatus.jsp         ####################################
 61850_workposition = 61850\u5de5\u4f5c\u72b6\u6001
+
+##################  ele-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406   ####################################
+Batt_pack_management = \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406
+

--
Gitblit v1.9.1