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

zss

10 天以前 d406310fa4d79e99b825a3698ee60af2991c261c

 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;