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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/DepartList/DepartListContent/DepartModel.vue

@@ -155,11 +155,20 @@
            }
            obj.then((res) => {
              if (res.success) {
                that.$message.success("添加成功")
                // that.$message.success("添加成功")
                that.$notification.success({
                  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