Merge branch 'dev_New_pro' into dev_pro_河南鹤壁

yuan

2026-05-23 893fda1fa8bc17002a866381e8940e1c31d11d93

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