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

云

4 天以前 837e27591dffbdf27100c2915300ddfceb64919c

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

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

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

    /**
     * 主键ID
     */