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

chenlu

2024-04-19 8f53694cc7ed5b9965d172a511ab39b914edbfb6

 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;