Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/mdcDriveTypeParamConfig/MdcDriveTypeParamConfigForm.vue

@@ -180,10 +180,18 @@
          }
          httpAction(httpurl, this.model, method).then((res) => {
            if (res.success) {
              that.$message.success(res.message);
              // that.$message.success(res.message);
              that.$notification.warning({
                message:'消息',
                description:res.message
              });
              that.$emit('ok');
            } else {
              that.$message.warning(res.message);
              // that.$message.warning(res.message);
              that.$notification.warning({
                message:'消息',
                description:res.message
              });
            }
          }).finally(() => {
            that.confirmLoading = false;