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

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

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