Merge branch 'dev_New_pro' into dev_山西_晋和园_pro

gongchunyi

2026-05-16 c5aac1b321d3840a56ccc41108d42b389d68681e

 src/main/java/com/ruoyi/production/bean/vo/ProductionOperationTaskVo.java

@@ -46,4 +46,7 @@

    @Schema(description = "是否结束）")
    private Boolean endOrder;

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