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

maven

6 小时以前 1755192ff6533145a6ed82da31d9f7816bbe00f5

 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;
};