Merge remote-tracking branch 'origin/master'

zhaowei

5 天以前 6e4b54ef350de163e4101558889d043d437e793c

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