merge: 合并origin/dev_New_pro从bd86068d之后的所有提交

gongchunyi

2026-05-18 ecfcfe8ac671cd2f46dc8d9b9129e1851957b7c0

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