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

chenlu

2024-07-08 4c368a7d1f0bb452b4cbb063a86701b571a01a95

 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;