Merge branch 'dev_New_pro' into dev_New_pro_财务

zss

9 天以前 b5d5cb947a194ceb34cd2797ab077f1484989305

 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;