From b56adb397d5ba2d20f9f2a689a0cba2bf398a6cb Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 03 十一月 2018 11:35:46 +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 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index bef158f..0958021 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1098,4 +1098,7 @@
 
 ##################  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