Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 72fc7715866a96cb7c587eb36af112730e7d12c2

 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();
        }