From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突

---
 src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html b/src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html
index 0adf002..24b1594 100644
--- a/src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html
+++ b/src/main/webapp/static/layuiadmin/layui/css/modules/layim/html/msgbox.html
@@ -99,7 +99,7 @@
 
   //娑堟伅淇℃伅娴�
   flow.load({
-    elem: '#LAY_view' //娴佸姞杞藉鍣�
+    elem: '#LAY_view' //娴佸姞杞借揣鏋�
     ,isAuto: false
     ,end: '<li class="layim-msgbox-tips">鏆傛棤鏇村鏂版秷鎭�</li>'
     ,done: function(page, next){ //鍔犺浇涓嬩竴椤�

--
Gitblit v1.9.1