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

liyong

昨天 3b94346fea3e6bdc74232615a11a764d0481383a

 src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java

@@ -20,7 +20,6 @@
    @ApiModelProperty(value = "产品id")
    private Long productModelId;

    //合格数量=报工数量-报废数量
    @ApiModelProperty(value = "报工数量")
    private BigDecimal quantity;