From 67047bebb45c0426ac96df76ed18e3879ffc09b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 11:49:59 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 3d1d844..accf309 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1085,3 +1085,13 @@
 ##################  ele-match-group.jsp \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406   ####################################
 Batt_pack_management = \u7535\u6c60\u7ec4\u914d\u7ec4\u7ba1\u7406
 
+
+##################  set-match-group.jsp  \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55	#################################
+Batt_makegrouprecord = \u7535\u6c60\u7ec4\u914d\u7ec4\u8bb0\u5f55
+
+##################   batt-state-mange.jsp \u673a\u623f\u72b6\u6001\u67e5\u8be2   ###########################
+Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2
+
+##################  batt-state-statistical.jsp  \u673a\u623f\u72b6\u6001\u7edf\u8ba1	#############################
+Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2
+

--
Gitblit v1.9.1