1.生产加工 2.煤种id优化

liding

2 天以前 733b9e6837365d2817d7e8a0005b2c167c18f77e

 main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java

@@ -125,6 +125,11 @@
                .collect(Collectors.toList());
    }

    @Override
    public List<OfficialInventory> selectOfficialAll() {
        return officialInventoryMapper.selectList(null);
    }

    @Transactional
    @Override
    public int mergeAll(OfficialInventoryDto officialInventoryDto) {
@@ -211,4 +216,5 @@
            }
        }
    }

}