From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 1609111..45a1e7b 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1096,10 +1096,16 @@
 ##################  batt-state-statistical.jsp  \u673a\u623f\u72b6\u6001\u7edf\u8ba1	#############################
 Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2
 
+Station_histor_events_query = \u673a\u623f\u5386\u53f2\u4e8b\u4ef6\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
+Station_traffic_statist = \u673a\u623f\u6d41\u91cf\u7edf\u8ba1\u67e5\u8be2
+Device_traffic_query = \u8bbe\u5907\u6d41\u91cf\u67e5\u8be2
+
+
+Batt_data_analysis = \u7535\u6c60\u6570\u636e\u5206\u6790
\ No newline at end of file

--
Gitblit v1.9.1