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

guoyuji

2024-05-22 40d76001fc009ab87c827477e225ef5fa012fdd1

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

@@ -33,6 +33,7 @@
    private Double area;
    private Integer quantity;
    private Double money;
    private Double otherMoney;
    private String remarks;
    private LocalDate createTime;
    private LocalDate updateTime;