Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-06 76dc7e5445218129cbdce8feef1eea4a82b3069b

 src/main/java/com/ruoyi/production/pojo/ProductionOrderRoutingOperationParam.java

@@ -90,4 +90,7 @@

    @Schema(description = "生产订单工艺路线工序ID")
    private Long productionOrderRoutingOperationId;

    @Schema(description = "生产报工表ID")
    private Long productionProductMainId;
}