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

zss

6 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

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