Merge remote-tracking branch 'origin/master'

zhuzhuanzhuan

2023-12-19 ef98bcf76c6265b66005ebed8a7b6f059db21ad0

 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
                  });