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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/device/execl/DeviceRepairExeclDto.java

@@ -37,7 +37,7 @@

    @ApiModelProperty("维修时间")
    @Excel(name = "维修时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date maintenanceTime;
    private LocalDateTime maintenanceTime;

    @ApiModelProperty("维修结果")
    @Excel(name = "维修结果")