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

廖井涛

2024-04-19 e8b408de769daf40d15f62c4e764d528ceb4f2f8

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

@@ -25,6 +25,7 @@
    private String remark;
    private LocalDate updateTime;
    private LocalDate endTime;
    private String processId;

    private Order order;
    private OrderDetail orderDetail;