chore: 合并失败

gongchunyi

2 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

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

@@ -24,4 +24,6 @@

    List<ProductionPlanSummaryDto> selectSummaryByProductType(ProductionPlanSummaryDto query);

    List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);

}