Merge branch 'master' into develop

zenglf

2023-09-28 8e75a78f55d60565eb48b25eafd4eb07939ce2cc

 src/views/mdc/base/modules/DepartList/DepartListTree/modules/DepartTree/TierModel.vue

@@ -158,11 +158,19 @@
            }
            obj.then((res) => {
              if (res.success) {
                that.$message.success("编辑成功")
                // that.$message.success("编辑成功")
                that.$notification.warning({
                  message:'消息',
                  description:"编辑成功"
                });
                // that.$message.success(res.message)
                that.$emit('ok', res.result)
              } else {
                that.$message.warning(res.message)
                // that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
              that.confirmLoading = false