Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_长治_...

liyong

2026-05-23 255efac022d9244f1964c420ca4ca3bc3b839ede

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