合并冲突掉的代码

spring

2025-09-02 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b

 src/views/equipmentManagement/upkeep/Modal/PlanModal.vue

@@ -7,10 +7,10 @@
  >
    <PlanForm ref="planFormRef"></PlanForm>
    <template #footer>
         <el-button type="primary" @click="sendForm" :loading="loading">
            {{ modalOptions.confirmText }}
         </el-button>
      <el-button @click="closeModal">{{ modalOptions.cancelText }}</el-button>
      <el-button type="primary" @click="sendForm" :loading="loading">
        {{ modalOptions.confirmText }}
      </el-button>
    </template>
  </el-dialog>
</template>