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

guoyuji

2024-05-23 6e87185c84d90e242ad93e47567c4b5e2be0c8d7

 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialInventory.java

@@ -23,6 +23,7 @@
    private Integer inventoryQuantity;
    private Integer availableQuantity;
    private Integer safetyStock;
    private Integer planQuantity;
    private Double totalArea;
    private Double singlePieceArea;
    private LocalDate dateOfManufacture;