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

云

3 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

 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;