Merge branch 'dev_New_pro' into dev_pro_山西_晋和园

gongchunyi

2026-06-02 a8b712bc5b0af9ee6da25e1518729b78aa778fed

 src/main/java/com/ruoyi/production/bean/vo/ProductionOrderRoutingOperationVo.java

@@ -20,4 +20,7 @@

    @Schema(description = "基础工序ID")
    private Long technologyOperationId;

    @Schema(description = "基础工序ID")
    private Long productionOrderRoutingOperationId;
}