From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +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 |    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 accf309..0958021 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1095,3 +1095,10 @@
 ##################  batt-state-statistical.jsp  \u673a\u623f\u72b6\u6001\u7edf\u8ba1	#############################
 Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2
 
+
+##################  batt-fault-manage.jsp  ##############################
+Problem_feedback = \u95ee\u9898\u53cd\u9988
+Station_problem_record = \u673a\u623f\u95ee\u9898\u8bb0\u5f55
+
+##################  batt-traffic-statistics1.jsp  ##############################
+Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2
\ No newline at end of file

--
Gitblit v1.9.1