Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-25 fec9f42e00f2df68a2a20cbf132b17bdeed8e63a

 north-glass-erp/src/main/java/com/example/erp/dto/pp/RawMaterialRequisitionDTO.java

@@ -14,9 +14,9 @@
    @ExcelProperty("原片产地")
    private String producer;
    @ExcelProperty("宽")
    private String width;
    private Double width;
    @ExcelProperty("高")
    private String height;
    private Double height;
    @ExcelProperty("已领数量")
    private Integer quantity;
    @ExcelProperty("已领面积")