From de072c451bdf8b49efea074e86d129e043e9df6b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 08:50:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties |    3 ++-
 1 files changed, 2 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 eb58994..49e5d5f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
+++ b/gx_tieta/WebRoot/WEB-INF/classes/global_zh_CN.properties
@@ -1111,7 +1111,8 @@
 
 ###################  ex-battinfo.jsp   ##################################
 Approval_station_install=\u57fa\u7ad9\u5b89\u88c5\u5ba1\u6279
-
+Audit = \u5ba1\u6838
+Acceptance = \u9a8c\u6536
 
 ##################  batch-set-curr.jsp  ##############################
 Bulk_nuclear_cap_test = \u6279\u91cf\u6838\u5bb9\u6d4b\u8bd5

--
Gitblit v1.9.1