From ab25922c19981835d2fefb54e7d4e53e34f14529 Mon Sep 17 00:00:00 2001 From: LiJun <LiJun@192.168.10.24> Date: 星期二, 13 十一月 2018 10:16:36 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/src/global_zh_CN.properties | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties index 8a10357..1609111 100644 --- a/gx_tieta/src/global_zh_CN.properties +++ b/gx_tieta/src/global_zh_CN.properties @@ -1089,8 +1089,9 @@ ################## 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 ########################### +################## batt-state-mange.jsp \u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2 ########################### Station_statequery = \u673a\u623f\u72b6\u6001\u67e5\u8be2 +Station_real_status_query=\u673a\u623f\u5b9e\u65f6\u72b6\u6001\u67e5\u8be2 ################## batt-state-statistical.jsp \u673a\u623f\u72b6\u6001\u7edf\u8ba1 ############################# Station_statestatistical = \u673a\u623f\u72b6\u6001\u7edf\u8ba1\u67e5\u8be2 @@ -1098,6 +1099,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