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

yuan

2026-04-25 85016ed2734e91e4c8ea03623cde11c29964ba5a

 src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java

@@ -27,5 +27,4 @@
    List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);

    ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);

}