From def60f975af368a585a0132a7afa07b45448c031 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 14:07:04 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/src/global_zh_CN.properties b/gx_tieta/src/global_zh_CN.properties
index 26138e4..eb58994 100644
--- a/gx_tieta/src/global_zh_CN.properties
+++ b/gx_tieta/src/global_zh_CN.properties
@@ -1038,6 +1038,7 @@
 
 ##################   equip-stats-change.jsp ##################
 Device_status_records_query = \u8bbe\u5907\u72b6\u6001\u8bb0\u5f55\u67e5\u8be2
+Device_history_event_query = \u8bbe\u5907\u5386\u53f2\u4e8b\u4ef6\u67e5\u8be2
 
 ###################  batt-attention.jsp #######################
 Batt_attention_manage=\u7535\u6c60\u5173\u6ce8\u7ba1\u7406

--
Gitblit v1.9.1