Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-24 4135cb0f17ddb84af8ac907129bf6af3e83feec9

 north-glass-erp/src/main/java/com/example/erp/dto/sd/CustomerDTO.java

@@ -21,7 +21,7 @@
    @ExcelProperty("产品")
    private String productName;
    @ExcelProperty("数量")
    private Integer quantity;
    private Double quantity;
    @ExcelProperty("面积")
    private Double area;
    @ExcelProperty("单价")