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

zss

8 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

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

@@ -67,4 +67,7 @@

    @Schema(description = "工序表id")
    private Long technologyOperationId;

    @Schema(description = "类型 区分计时和计件，0计时，1计件")
    private Integer type;
}