From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
index df84949..a5e511a 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
@@ -364,7 +364,7 @@
               deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
                 if (res.success) {
                   // that.$message.success(res.message)
-                  that.$notification.warning({
+                  that.$notification.success({
                     message:'娑堟伅',
                     description:res.message
                   });
@@ -475,10 +475,6 @@
   .ant-modal-cust-warp .ant-modal-content {
     height: 90% !important;
     overflow-y: hidden;
-  }
-
-  #app .desktop {
-    height: auto !important;
   }
 
   /** Button鎸夐挳闂磋窛 */

--
Gitblit v1.9.3