From a2cb03002bc7b9ed76e9586947fec73ebc223215 Mon Sep 17 00:00:00 2001 From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139> Date: 星期三, 16 一月 2019 17:37:45 +0800 Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw --- gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties index 8734d71..656ac19 100644 --- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties +++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties @@ -1121,4 +1121,7 @@ BTSEquipment_upgrades = BTS\u8bbe\u5907\u5347\u7ea7 ################## bat-set-test.jsp ############################## -Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e \ No newline at end of file +Batch_batt_param_set = \u6279\u91cf\u7535\u6c60\u53c2\u6570\u8bbe\u7f6e + +################## sys-set-test.jsp ############################## +Batch_sys_param_set = \u6279\u91cf\u7cfb\u7edf\u53c2\u6570\u8bbe\u7f6e \ No newline at end of file -- Gitblit v1.9.1