Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/DepartList/DepartDataruleModal.vue

@@ -81,9 +81,17 @@
        }
        postAction(this.url.datarule,params).then(res=>{
          if(res.success){
            this.$message.success(res.message)
            // this.$message.success(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }else{
            this.$message.error(res.message)
            // this.$message.error(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        })
      },