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

chenlu

2024-07-25 ba6eac2b22016a81d989cbf560694c15ca9aa6b9

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

@@ -38,7 +38,7 @@
    @ExcelProperty("单价")
    private Double price;
    @ExcelProperty("总金额")
    private Long grossAmount;
    private Double grossAmount;
    @ExcelProperty("一级类别")
    private String levelOne;
    @ExcelProperty("二级类别")