From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 10 四月 2024 23:41:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

---
 src/main/webapp/static/js/basShuttleErr/basShuttleErr.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/basShuttleErr/basShuttleErr.js b/src/main/webapp/static/js/basShuttleErr/basShuttleErr.js
index 0e99d32..2f55b25 100644
--- a/src/main/webapp/static/js/basShuttleErr/basShuttleErr.js
+++ b/src/main/webapp/static/js/basShuttleErr/basShuttleErr.js
@@ -144,7 +144,7 @@
         admin.open({
             type: 1,
             area: '600px',
-            title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+            title: (mData ? '淇敼' : '娣诲姞') + '鍥涘悜杞﹀紓甯哥爜',
             content: $('#editDialog').html(),
             success: function (layero, dIndex) {
                 layDateRender(mData);

--
Gitblit v1.9.1