Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

liding

2026-06-01 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f

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