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/agvBasDevpVisualized/basDevp.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js b/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js
index 75c55ac..1cdfe3f 100644
--- a/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js
+++ b/src/main/webapp/static/js/agvBasDevpVisualized/basDevp.js
@@ -393,7 +393,7 @@
                     layer.msg("姝ょ珯鐐规殏鏈粦瀹氫换浣曟潯鐮�");
                     return;
                 }
-                layer.confirm('纭畾瑙ｇ粦'+(data.devNo)+'绔欑偣鐨勬墭鐩樼爜锛�', function(){
+                layer.confirm('纭畾瑙ｇ粦'+(data.devNo)+'绔欑偣鐨勮揣鏋剁爜锛�', function(){
                     $.ajax({
                         url: baseUrl+"/agv/basDevp/unbind/auth",
                         headers: {'token': localStorage.getItem('token')},

--
Gitblit v1.9.1