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

liyong

4 天以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

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