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/FinishedGoodsInventory.java

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

    private Order order;
    private OrderDetail orderDetail;