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

zss

2026-05-22 222685a758d615ef69d8dafd5bcf0c270d6d0fb2

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