Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

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

@@ -47,6 +47,12 @@
    @Schema(description = "是否结束）")
    private Boolean endOrder;

    @Schema(description = "车间id")
    private Long workshopId;

    @Schema(description = "车间名称")
    private String workshopName;

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