Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

liding

2026-06-01 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f

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