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

gongchunyi

2026-05-22 b3712bb9c618d3cb74b6a200fd83c2ba0577ac3d

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