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

zss

9 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

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