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

liding

22 小时以前 820e9e9e5e4ce7e8fb477ae8f2573dab1f2074de

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