From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
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