Merge remote-tracking branch 'origin/dev' into dev

lishenao

10 天以前 fde27654b1b21a8d2c149d3d12f86c3c7314c091

 src/views/equipmentManagement/upkeep/Form/MaintenanceForm.vue

@@ -46,7 +46,8 @@
  form.maintenanceActuallyName =
    data.maintenanceActuallyName ?? userStore.nickName;
  form.maintenanceActuallyTime =
    data.maintenanceActuallyTime ?? dayjs().format("YYYY-MM-DD HH:mm:ss");
    dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss") ??
    dayjs().format("YYYY-MM-DD HH:mm:ss");
  form.maintenanceResult = data.maintenanceResult;
};