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

chenlu

2025-07-09 ff195859283806241f3cb40e33170dd77a7eed61

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

@@ -269,4 +269,6 @@
    List<MaterialLog> getOptimizeOutboundReport(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    Map<String,Integer> getOptimizeOutboundReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, MaterialLog materialLog, String type);

    List<Map<String,Object>> getSelectMaterialInventoryMes();
}