Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

gongchunyi

昨天 32536352a81b1cb60add2303b7ef5a8f6bf54a7d

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