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

zss

2 天以前 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

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

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

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