Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

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

@@ -21,6 +21,10 @@
    @Schema(description = "规格型号")
    private String deviceModel;

    @Schema(description = "项目")
    @Excel(name = "项目")
    private String machineryCategory;

    @Excel(name = "计划保养日期", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
    @Schema(description = "计划保养日期")
    private Date maintenancePlanTime;