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

guoyujie

昨天 9b362b55344d0c854355eb2db1de84219b53a77e

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

@@ -158,6 +158,10 @@
    List<Map<String, Object>> getorderProductByBoxNo(String orderId, String boxNo);

    List<Map<String, Object>> getPrintDetail(String orderId, String boxNo, Integer productId, String thickness);

    Boolean deleteFinishedGoodsInventoryDate();

    List<FinishedGoodsInventory> getFinishedGoodsInventoryList();
}