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

gongchunyi

3 天以前 cd2aafde048f46bd7123ec6cc773d7200172ee04

 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java

@@ -40,4 +40,7 @@

    @ApiModelProperty(value = "报废数量")
    private BigDecimal scrapQty;

    @ApiModelProperty(value = "工单类型 正常 /返工返修")
    private String workOrderType;
}