Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-20 8c72b6be29895aa43d10464f747b3f55efb7d390

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -37,7 +37,7 @@
    @Schema(description = "最后执行时间")
    private LocalDateTime lastExecutionTime;

    @Schema(description = "设备类目")
    @Schema(description = "设备项目")
    private String machineryCategory;