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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

@@ -38,6 +38,6 @@
    @ApiModelProperty(value = "完成进度")
    private BigDecimal completionStatus;

    @ApiModelProperty(value = "附件详情")
    private List<ProductWorkOrderFile> productWorkOrderFiles;
    @ApiModelProperty(value = "报废数量")
    private BigDecimal scrapQty;
}