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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/shift/ShiftInfo.vue

@@ -154,7 +154,7 @@
        deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
          if (res.success) {
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });
@@ -173,7 +173,7 @@
        putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
          if (res.success) {
            // _this.$message.success('操作成功！')
            _this.$notification.warning({
            _this.$notification.success({
              message:'消息',
              description:"操作成功"
            });