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

zss

8 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

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