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

chenlu

2024-08-22 b85a2ab202e1da68ca1e532a783dc0f5685dad3b

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

@@ -47,4 +47,6 @@
    private String totalThickness;
    @ExcelProperty("客户简称")
    private String customerAbbreviation;
    @ExcelProperty("订单加工要求")
    private String processingNotes;
}