Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddCon.vue

@@ -217,7 +217,7 @@
            postAction(this.url.settingCalendar, formData).then((res) => {
              if (res.success) {
                // that.$message.success(res.message)
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });