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

guoyuji

2024-12-10 7b0d59dbd16a0f90eec1ad35eff64cf40d3b97e7

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -32,7 +32,7 @@
    private String icon;
    @ExcelProperty("包装方式")
    private String packType;
    @ExcelProperty("发货名称")
    @ExcelProperty("发货时间")
    private LocalDate deliveryDate;
    @ExcelProperty("批次")
    private String batch;