Merge branch 'dev_New' into pcdz

zss

10 天以前 41d35c56043108b66a14e7a2d2d13bedfc2508e0

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

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

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

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