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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue

@@ -126,6 +126,22 @@
              },
            ],
          },
          vacationDate:{
            rules:[
              {
                required:true,
                message: "请选择休假时间"
              },
            ],
          },
          vacationType:{
            rules:[
              {
                required:true,
                message: "请选择假期类型"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -256,7 +272,7 @@
            obj.then((res) => {
              if (res.success) {
                // that.$message.success("修改成功")
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:"修改成功"
                });