From a6991a33e18f69264f93a63459a4b64ea799295a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 05 八月 2025 13:02:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-admin/src/page/components/ConfirmButton.jsx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/page/components/ConfirmButton.jsx b/rsf-admin/src/page/components/ConfirmButton.jsx
index e39fe98..446a506 100644
--- a/rsf-admin/src/page/components/ConfirmButton.jsx
+++ b/rsf-admin/src/page/components/ConfirmButton.jsx
@@ -20,7 +20,7 @@
         setOpen(false);
     };
 
-    const handleConfirm = (event) => {
+    const handleConfirm = (event) => {        
         handleClose(event);
         onConfirm();
     };
@@ -44,7 +44,7 @@
                 <DialogTitle>{translate('common.msg.confirm.tip')}</DialogTitle>
                 <DialogContent>
                     <DialogContentText>
-                        {translate('common.msg.confirm.desc')}
+                        {data ? data : translate('common.msg.confirm.desc')}
                     </DialogContentText>
                 </DialogContent>
                 <DialogActions>

--
Gitblit v1.9.1