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

yuan

2026-04-24 b4a9e12e00b78e1aef8acda070434de9ffd0d66a

 src/main/java/com/ruoyi/production/service/ProductionPlanService.java

@@ -24,16 +24,6 @@
    IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto);

    /**
     * 手动同步
     */
    void loadProdData();

    /**
     * 定时同步
     */
    void syncProdDataJob();

    /**
     * 合并生产计划
     */
    boolean combine(ProductionPlanDto productionPlanDto);