Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

6 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

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