Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-22 42bc535c947bcf999c706a753635d35ef73f91e6

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -198,7 +198,6 @@

    public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
        Integer offset = (pageNum - 1) * pageSize;
        System.out.println(optimizeUse);
        Map<String, Object> map = new HashMap<>();
        map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
        map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));