Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

yuan

9 天以前 d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff

 src/main/java/com/ruoyi/production/service/impl/ProductionOrderPickRecordServiceImpl.java

@@ -24,6 +24,7 @@

    @Override
    public List<ProductionOrderPickRecordVo> listFeedingRecord(ProductionOrderPickRecordDto dto) {
        // 查询投料记录
        if (dto == null || dto.getProductionOrderId() == null || dto.getPickId() == null) {
            return Collections.emptyList();
        }