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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

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

@@ -34,6 +34,10 @@

    @ApiModelProperty("报修内容")
    private String remark;
    
    @ApiModelProperty(value = "设备类目")
    private String machineryCategory;


    @ApiModelProperty("维修人")
    private String maintenanceName;
@@ -85,4 +89,7 @@
        private Long id;
        private Integer quantity;
    }

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}