Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-10-09 c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -96,7 +96,8 @@

    Boolean insertFinishedGoodsInventory(@Param("flowCard") FlowCard flowCard,
                                         @Param("storageRegion") String storageRegion,
                                         @Param("remark") String remark, @Param("container") String container);
                                         @Param("remark") String remark, @Param("container") String container,
                                         @Param("getComputeArea") Double getComputeArea);


    List<OrderDetail> getSelectDeliveryDetail(@Param("offset") Integer offset,