Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-19 c7631c62aac9c97e80ed59ebb2eebd4a314e0784

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

@@ -35,6 +35,7 @@
    private String edgingType;
    private Double weight;
    private Double perimeter;
    private String otherColumns;
    private Integer warehouseNum;
    private Integer deliveryNum;
    private Integer returnNum;