From 97f57b2ba6ffc490ccd9552dbfbdbc245973764d Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 11 一月 2019 10:20:57 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/bat-set-test.jsp | 2 +-
gx_tieta/WebRoot/sys-set-test.jsp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/bat-set-test.jsp b/gx_tieta/WebRoot/bat-set-test.jsp
index 4f0944c..e0c2d12 100644
--- a/gx_tieta/WebRoot/bat-set-test.jsp
+++ b/gx_tieta/WebRoot/bat-set-test.jsp
@@ -913,7 +913,7 @@
data = rs.data;
data = formatSearchData(data);
}else {
- layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+ layer.msg('娌℃湁鍙缃殑鏈烘埧!');
}
// 濡傛灉鏈夋坊鍔犵殑鏁版嵁
if(data.length !=0) {
diff --git a/gx_tieta/WebRoot/sys-set-test.jsp b/gx_tieta/WebRoot/sys-set-test.jsp
index 3b059eb..ed505a2 100644
--- a/gx_tieta/WebRoot/sys-set-test.jsp
+++ b/gx_tieta/WebRoot/sys-set-test.jsp
@@ -880,7 +880,7 @@
if(rs.code == 1) {
data = rs.data;
}else {
- layer.msg('娌℃湁鍙缃殑鐢垫睜缁�!');
+ layer.msg('娌℃湁鍙缃殑鏈烘埧!');
}
// 濡傛灉鏈夋坊鍔犵殑鏁版嵁
--
Gitblit v1.9.1