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

guoyuji

2024-04-25 37fce1a5a19d25453eb7481ce56eb71423e72af1

 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;