Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_鹤壁_强信宇_pro

yuan

2026-05-21 9cc62ede0564186133ffd8ce1ff6eecee9d54ce5

 src/views/equipmentManagement/upkeep/index.vue

@@ -371,7 +371,9 @@
      label: "计划保养日期",
      align: "center",
      prop: "maintenancePlanTime",
      formatData: cell => dayjs(cell).format("YYYY-MM-DD"),
      formatData: cell => {
        return cell == null ? "-" : dayjs(cell).format("YYYY-MM-DD");
      },
    },
    {
      label: "录入人",