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

guoyujie

2025-06-30 ab6ac91b7ed9ae3f9c68766f499ece11585c8859

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

@@ -56,7 +56,7 @@

    Boolean updateInventory(@Param("flowCard") FlowCard flowCard,
                            @Param("storageRegion") String storageRegion,
                            @Param("remark") String remark);
                            @Param("remark") String remark, @Param("container") String container);

    Boolean updateInventoryOut(@Param("finishedOperateLog") FinishedOperateLog finishedOperateLog);

@@ -89,7 +89,7 @@

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


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