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

liyong

4 天以前 700e40694345fec652d7dca688912c36af18e1ae

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